Add TryRestore method and overloads to TryBuild to have implicit restore (#36)

Fixes #31

Author: jeffkl

src/MSBuildProjectCreator.UnitTests/App.config

@@ -30,35 +30,6 @@
         <assemblyIdentity name="Microsoft.Build.Conversion.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
         <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
       </dependentAssembly>
-      <!-- Redirects for components dropped by Visual Studio -->
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Activities.Build" culture="neutral" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="4.0.0.0" newVersion="16.0.0.0" />
-        <codeBase version="16.0.0.0" href=".\amd64\Microsoft.Activities.Build.dll" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="XamlBuildTask" culture="neutral" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="4.0.0.0" newVersion="16.0.0.0" />
-        <codeBase version="16.0.0.0" href=".\amd64\XamlBuildTask.dll" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <bindingRedirect oldVersion="16.0.0.0-16.4.0.0" newVersion="16.4.0.0" />
-        <codeBase version="16.4.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
-      </dependentAssembly>
-      <!-- Workaround for crash in C++ CodeAnalysis scenarios due to https://github.com/Microsoft/msbuild/issues/1675 -->
-      <dependentAssembly>
-        <assemblyIdentity name="FxCopTask" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <codeBase version="16.0.0.0" href="..\..\Microsoft\VisualStudio\v16.0\CodeAnalysis\FxCopTask.dll" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.CodeAnalysis" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <codeBase version="16.0.0.0" href="..\..\Microsoft\VisualStudio\v16.0\CodeAnalysis\Microsoft.VisualStudio.CodeAnalysis.dll" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.VisualStudio.CodeAnalysis.Sdk" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <codeBase version="16.0.0.0" href="..\..\Microsoft\VisualStudio\v16.0\CodeAnalysis\Microsoft.VisualStudio.CodeAnalysis.Sdk.dll" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

src/MSBuildProjectCreator.UnitTests/BuildTests.cs

@@ -32,5 +32,39 @@ public void BuildTargetOutputsTest()
 
             item.Value.Items.Select(i => i.ItemSpec).ShouldBe(new[] { "E32099C7AF4E481885B624E5600C718A", "7F38E64414104C6182F492B535926187" });
         }
+
+        [Fact]
+        public void RestoreTargetCanBeRun()
+        {
+            ProjectCreator
+                .Create(Path.Combine(TestRootPath, "project1.proj"))
+                .Target("Restore")
+                    .TaskMessage("312D2E6ABDDC4735B437A016CED1A68E", Framework.MessageImportance.High, condition: "'$(MSBuildRestoreSessionId)' != ''")
+                    .TaskError("MSBuildRestoreSessionId was not defined", condition: "'$(MSBuildRestoreSessionId)' == ''")
+                .TryRestore(out bool result, out BuildOutput buildOutput);
+
+            result.ShouldBeTrue(buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "312D2E6ABDDC4735B437A016CED1A68E" && i.Importance == Framework.MessageImportance.High, buildOutput.GetConsoleLog());
+        }
+
+        [Fact]
+        public void CanRestoreAndBuild()
+        {
+            ProjectCreator.Create(
+                    path: GetTempFileName(".csproj"))
+                .Target("Restore")
+                    .TaskMessage("Restoring...", Framework.MessageImportance.High)
+                .Target("Build")
+                    .TaskMessage("Building...", Framework.MessageImportance.High)
+                .Save()
+                .TryBuild(restore: true, "Build", out bool result, out BuildOutput buildOutput);
+
+            result.ShouldBeTrue(buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Restoring...", buildOutput.GetConsoleLog());
+
+            buildOutput.MessageEvents.High.ShouldContain(i => i.Message == "Building...", buildOutput.GetConsoleLog());
+        }
     }
 }

src/MSBuildProjectCreator.UnitTests/SdkCsprojTests.cs

@@ -32,34 +32,6 @@ public void CanBuild()
             result.ShouldBeTrue(buildOutput.GetConsoleLog());
         }
 
-        [Fact]
-        public void CanRestoreAndBuild()
-        {
-            ProjectCollection projectCollection = new ProjectCollection(globalProperties: new Dictionary<string, string>
-            {
-                ["MSBuildRestoreSessionId"] = Guid.NewGuid().ToString("D"),
-            });
-
-            string path = GetTempFileName(".csproj");
-
-            const string targetFramework = "net472";
-
-            ProjectCreator.Templates.SdkCsproj(
-                    targetFramework: targetFramework,
-                    projectCollection: projectCollection)
-                .Save(path)
-                .TryBuild("Restore", out bool restoreResult, out BuildOutput restoreBuildOutput);
-
-            restoreResult.ShouldBeTrue(restoreBuildOutput.GetConsoleLog());
-
-            ProjectCreator.Templates.SdkCsproj(
-                    targetFramework: targetFramework)
-                .Save(path)
-                .TryBuild("Build", out bool result, out BuildOutput buildOutput);
-
-            result.ShouldBeTrue(buildOutput.GetConsoleLog());
-        }
-
         [Fact]
         public void CustomSdk()
         {