Merge pull request #1230 from nguerrera/fix-build

Fix build break due to successful, but bad merge
dotnet · May 18, 2017 · 81be051 · 81be051
2 parents 2a6ccc1 + a2f91af
commit 81be051
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
@@ -291,9 +291,9 @@ public void It_uses_lowercase_form_of_the_target_framework_for_the_output_path()
             string[] extraArgs = new[] { "/p:TargetFramework=NETCOREAPP1.1" };
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject, testProject.Name)
-                .Restore(testProject.Name, extraArgs);
+                .Restore(Log, testProject.Name, extraArgs);
 
-            var buildCommand = new BuildCommand(Stage0MSBuild, Path.Combine(testAsset.TestRoot, testProject.Name));
+            var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
 
             buildCommand
                 .Execute(extraArgs)

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToVerifyNuGetReferenceCompat.cs
@@ -176,7 +176,6 @@ public void Net461_is_not_implicit_for_Netstandard_and_Netcore_less_than_20(stri
 
             var restoreCommand = testProjectTestAsset.GetRestoreCommand(Log, relativePath: testProjectName);
             restoreCommand.AddSource(Path.GetDirectoryName(_net461PackageReference.NupkgPath));
-            restoreCommand.CaptureStdOut();
             restoreCommand.Execute().Should().Fail();
         }
 
@@ -192,7 +191,6 @@ public void It_is_possible_to_disabled_net461_implicit_package_target_fallback()
 
             var restoreCommand = testProjectTestAsset.GetRestoreCommand(Log, relativePath: testProjectName);
             restoreCommand.AddSource(Path.GetDirectoryName(_net461PackageReference.NupkgPath));
-            restoreCommand.CaptureStdOut();
             restoreCommand.Execute().Should().Fail();
         }