Fix issue with implicit restore global properties (#133)

Make a copy of the global properties for restore since they are modified to ensure the evaluation is unique

Fixes #132

Author: jeffkl

src/Microsoft.Build.Utilities.ProjectCreation.UnitTests/BuildTests.cs

@@ -80,18 +80,6 @@ public void BuildWithGlobalProperties()
             buildOutputWithGlobalProperties.MessageEvents.High.ShouldHaveSingleItem(buildOutputWithGlobalProperties.GetConsoleLog()).Message.ShouldBe("Value = D7BBABDFB2D142D3A75E0C1A33E33780", buildOutputWithGlobalProperties.GetConsoleLog());
         }
 
-        [Fact]
-        public void ProjectWithNoPathBuildThrowsInvalidOperationException()
-        {
-            InvalidOperationException exception = Should.Throw<InvalidOperationException>(() =>
-            {
-                ProjectCreator.Templates.LogsMessage("6E83EF78-959F-45A2-9FE3-08BAD99C0F92")
-                    .TryBuild(out bool _);
-            });
-
-            exception.Message.ShouldBe("Project has not been given a path to save to.");
-        }
-
         [Fact]
         public void CanBuildLotsOfProjects()
         {
@@ -233,6 +221,77 @@ public void ProjectCollectionLoggersWorkWithRestore()
             fileLogContents.ShouldContain("B7F9A257198D4A44A06BB6146AB27440", Case.Sensitive, fileLogContents);
         }
 
+        [Fact]
+        public void ProjectWithNoPathBuildThrowsInvalidOperationException()
+        {
+            InvalidOperationException exception = Should.Throw<InvalidOperationException>(() =>
+            {
+                ProjectCreator.Templates.LogsMessage("6E83EF78-959F-45A2-9FE3-08BAD99C0F92")
+                    .TryBuild(out bool _);
+            });
+
+            exception.Message.ShouldBe("Project has not been given a path to save to.");
+        }
+
+        [Fact]
+        public void RestoreAndBuildUseDifferentGlobalPropertiesWhenGlobalPropertiesSpecified()
+        {
+            Dictionary<string, string> globalProperties = new Dictionary<string, string>
+            {
+                ["Something"] = bool.TrueString,
+            };
+
+            ProjectCreator.Create(
+                    path: GetTempFileName(".csproj"))
+                .Target("Restore")
+                    .TaskMessage("Restore $(ExcludeRestorePackageImports)", MessageImportance.High)
+                    .TaskMessage("Restore Something $(Something)", MessageImportance.High)
+                .Target("Build")
+                    .TaskMessage("Build $(ExcludeRestorePackageImports)", MessageImportance.High)
+                    .TaskMessage("Build Something $(Something)", MessageImportance.High)
+                .Save()
+                .TryBuild(restore: true, "Build", globalProperties, out bool result, out BuildOutput buildOutput);
+
+            result.ShouldBeTrue(buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Restore true", buildOutput.GetConsoleLog());
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Restore Something True", buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldNotContain(i => i.Message == "Build true", buildOutput.GetConsoleLog());
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Build Something True", buildOutput.GetConsoleLog());
+        }
+
+        [Fact]
+        public void RestoreAndBuildUseDifferentGlobalPropertiesWhenProjectCollectionSpecified()
+        {
+            Dictionary<string, string> globalProperties = new Dictionary<string, string>
+            {
+                ["Something"] = bool.TrueString,
+            };
+
+            using ProjectCollection projectCollection = new ProjectCollection(globalProperties);
+
+            ProjectCreator.Create(
+                    path: GetTempFileName(".csproj"),
+                    projectCollection: projectCollection)
+                .Target("Restore")
+                    .TaskMessage("Restore $(ExcludeRestorePackageImports)", MessageImportance.High)
+                    .TaskMessage("Restore Something $(Something)", MessageImportance.High)
+                .Target("Build")
+                    .TaskMessage("Build $(ExcludeRestorePackageImports)", MessageImportance.High)
+                    .TaskMessage("Build Something $(Something)", MessageImportance.High)
+                .Save()
+                .TryBuild(restore: true, "Build", globalProperties, out bool result, out BuildOutput buildOutput);
+
+            result.ShouldBeTrue(buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Restore true", buildOutput.GetConsoleLog());
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Restore Something True", buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldNotContain(i => i.Message == "Build true", buildOutput.GetConsoleLog());
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Build Something True", buildOutput.GetConsoleLog());
+        }
+
         [Fact]
         public void RestoreTargetCanBeRun()
         {

src/Microsoft.Build.Utilities.ProjectCreation/ProjectCreator.Build.cs

@@ -529,15 +529,16 @@ private void Restore(IDictionary<string, string> globalProperties, BuildOutput b
         {
             Save();
 
-            globalProperties ??= new Dictionary<string, string>(ProjectCollection.GlobalProperties);
+            // IMPORTANT: Make a copy of the global properties here so as not to modify the ones passed in
+            Dictionary<string, string> restoreGlobalProperties = new Dictionary<string, string>(globalProperties ?? ProjectCollection.GlobalProperties);
 
-            globalProperties["ExcludeRestorePackageImports"] = "true";
-            globalProperties["MSBuildRestoreSessionId"] = Guid.NewGuid().ToString("D");
+            restoreGlobalProperties["ExcludeRestorePackageImports"] = "true";
+            restoreGlobalProperties["MSBuildRestoreSessionId"] = Guid.NewGuid().ToString("D");
 
             BuildResult buildResult = BuildManagerHost.Build(
                 FullPath,
                 new[] { "Restore" },
-                globalProperties,
+                restoreGlobalProperties,
                 new List<Framework.ILogger>(ProjectCollection.Loggers.Concat(buildOutput.AsEnumerable())),
                 BuildRequestDataFlags.ClearCachesAfterBuild | BuildRequestDataFlags.SkipNonexistentTargets | BuildRequestDataFlags.IgnoreMissingEmptyAndInvalidImports);