Merge branch 'release/7.0.2xx'

dotnet · Jan 16, 2023 · ab4af65 · ab4af65
2 parents 0757287 + 0040bb6
commit ab4af65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build/RunTestsOnHelix.sh b/build/RunTestsOnHelix.sh
@@ -17,6 +17,7 @@ cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionD
 # call dotnet new so the first run message doesn't interfere with the first test
 dotnet new --debug:ephemeral-hive
 # We downloaded a special zip of files to the .nuget folder so add that as a source
+dotnet nuget list source --configfile $TestExecutionDirectory/nuget.config
 dotnet nuget add source $DOTNET_ROOT/.nuget --configfile $TestExecutionDirectory/nuget.config
 dotnet nuget list source --configfile $TestExecutionDirectory/nuget.config
 dotnet nuget remove source dotnet6-transport --configfile $TestExecutionDirectory/nuget.config

diff --git a/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs b/src/Tests/Microsoft.NET.Build.Tests/ReferenceExeTests.cs
@@ -317,7 +317,8 @@ public void TestProjectCanReferenceExe(string testTemplateName)
             var testProjectDirectory = Path.Combine(testAsset.TestRoot, "TestProject");
             Directory.CreateDirectory(testProjectDirectory);
 
-            new DotnetCommand(Log, "new", testTemplateName, "--debug:ephemeral-hive")
+            new DotnetNewCommand(Log, testTemplateName)
+                .WithVirtualHive()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
                 .Should()
@@ -353,7 +354,8 @@ public void ExeProjectCanReferenceTestProject(string testTemplateName)
             var testProjectDirectory = Path.Combine(testAsset.TestRoot, "TestProject");
             Directory.CreateDirectory(testProjectDirectory);
 
-            new DotnetCommand(Log, "new", testTemplateName, "--debug:ephemeral-hive")
+            new DotnetNewCommand(Log, testTemplateName)
+                .WithVirtualHive()
                 .WithWorkingDirectory(testProjectDirectory)
                 .Execute()
                 .Should()