Simplfy NuGet cache folder handling in integration tests (#7573)

Author: Youssef1313

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AbortionTests.cs

@@ -36,7 +36,7 @@ public async Task AbortWithCTRLPlusC_CancellingTests(string tfm)
         testHostResult.AssertOutputMatchesRegex("Canceling the test session.*");
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         private const string Sources = """
 #file AbortMSTestAsset.csproj

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AnalyzersTests.cs

@@ -56,7 +56,6 @@ public void TestMethod()
         using TestAsset testAsset = await TestAsset.GenerateAssetAsync("TestForMSTEST0001", code);
         DotnetMuxerResult result = await DotnetCli.RunAsync(
             $"build {testAsset.TargetAssetPath}",
-            AcceptanceFixture.NuGetGlobalPackagesFolder.Path,
             warnAsError: false,
             cancellationToken: TestContext.CancellationToken);
         if (isAdapterReferenced)
@@ -113,7 +112,6 @@ public void TestMethod()
         using TestAsset testAsset = await TestAsset.GenerateAssetAsync("AnalyzersMetapackage", code);
         DotnetMuxerResult result = await DotnetCli.RunAsync(
             $"build {testAsset.TargetAssetPath}",
-            AcceptanceFixture.NuGetGlobalPackagesFolder.Path,
             warnAsError: false,
             cancellationToken: TestContext.CancellationToken);
         result.AssertOutputContains("MSTEST0014");
@@ -153,7 +151,6 @@ public void TestMethod()
         using TestAsset testAsset = await TestAsset.GenerateAssetAsync("AnalyzersTestFrameworkPackage", code);
         DotnetMuxerResult result = await DotnetCli.RunAsync(
             $"build {testAsset.TargetAssetPath}",
-            AcceptanceFixture.NuGetGlobalPackagesFolder.Path,
             warnAsError: false,
             cancellationToken: TestContext.CancellationToken);
         result.AssertOutputContains("MSTEST0014");
@@ -196,7 +193,6 @@ public void TestMethod()
         using TestAsset testAsset = await TestAsset.GenerateAssetAsync("Analyzers", code);
         DotnetMuxerResult result = await DotnetCli.RunAsync(
             $"build {testAsset.TargetAssetPath}",
-            AcceptanceFixture.NuGetGlobalPackagesFolder.Path,
             environmentVariables: new()
             {
                 ["DOTNET_CLI_UI_LANGUAGE"] = "it-IT",
@@ -295,7 +291,7 @@ public async void TestMethod1()
 
     private static async Task AssertAnalysisModeAsync(string mode, string[] contains, string[] doesNotContain, string targetAssetPath)
     {
-        async Task<DotnetMuxerResult> BuildTaskAsync() => await DotnetCli.RunAsync($"build {targetAssetPath}", AcceptanceFixture.NuGetGlobalPackagesFolder.Path, warnAsError: false);
+        async Task<DotnetMuxerResult> BuildTaskAsync() => await DotnetCli.RunAsync($"build {targetAssetPath}", warnAsError: false);
 
         string output;
         if (mode is "Recommended" or "All")

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AppDomainTests.cs

@@ -26,7 +26,7 @@ public async Task RunTests_With_VSTest(bool? disableAppDomain)
             null => string.Empty,
         };
 
-        DotnetMuxerResult compilationResult = await DotnetCli.RunAsync($"test -c Release --no-build {AssetFixture.TargetAssetPath}{disableAppDomainCommand}", AcceptanceFixture.NuGetGlobalPackagesFolder.Path, workingDirectory: AssetFixture.TargetAssetPath, cancellationToken: TestContext.CancellationToken);
+        DotnetMuxerResult compilationResult = await DotnetCli.RunAsync($"test -c Release --no-build {AssetFixture.TargetAssetPath}{disableAppDomainCommand}", workingDirectory: AssetFixture.TargetAssetPath, cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, compilationResult.ExitCode);
 
         compilationResult.AssertOutputContains(@"Passed!  - Failed:     0, Passed:     2, Skipped:     0, Total:     2");
@@ -45,7 +45,7 @@ public async Task DiscoverTests_With_VSTest(bool? disableAppDomain)
             null => string.Empty,
         };
 
-        DotnetMuxerResult compilationResult = await DotnetCli.RunAsync($"test -c Release --no-build {AssetFixture.TargetAssetPath} --list-tests{disableAppDomainCommand}", AcceptanceFixture.NuGetGlobalPackagesFolder.Path, workingDirectory: AssetFixture.TargetAssetPath, cancellationToken: TestContext.CancellationToken);
+        DotnetMuxerResult compilationResult = await DotnetCli.RunAsync($"test -c Release --no-build {AssetFixture.TargetAssetPath} --list-tests{disableAppDomainCommand}", workingDirectory: AssetFixture.TargetAssetPath, cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, compilationResult.ExitCode);
     }
 
@@ -107,7 +107,7 @@ private static string GetTestDllPath(string assetPath, string targetFramework) =
 
     public TestContext TestContext { get; set; }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         private const string SingleTestSourceCode = """
 #file AppDomainTests.csproj
@@ -125,6 +125,10 @@ we end up with a -dev or -ci version which will lose resolution over -preview de
     <UseVSTest>true</UseVSTest>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.TestPlatform" Version="[$MicrosoftNETTestSdkVersion$]" />
+  </ItemGroup>
+
 </Project>
 
 #file global.json
@@ -177,6 +181,7 @@ public static IEnumerable<int> GetData()
         public override (string ID, string Name, string Code) GetAssetsToGenerate() => (AssetName, AssetName,
                 SingleTestSourceCode
                 .PatchCodeWithReplace("$TargetFramework$", TargetFrameworks.NetFramework[0])
-                .PatchCodeWithReplace("$MSTestVersion$", MSTestVersion));
+                .PatchCodeWithReplace("$MSTestVersion$", MSTestVersion)
+                .PatchCodeWithReplace("$MicrosoftNETTestSdkVersion$", MicrosoftNETTestSdkVersion));
     }
 }

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AspireSdkTests.cs

@@ -28,7 +28,6 @@ public async Task EnableAspireProperty_WhenUsingVSTest_AllowsToRunAspireTests()
             : testHost.FullName + ".dll";
         DotnetMuxerResult dotnetTestResult = await DotnetCli.RunAsync(
             $"test {exeOrDllName}",
-            AcceptanceFixture.NuGetGlobalPackagesFolder.Path,
             workingDirectory: AssetFixture.AspireProjectPath,
             warnAsError: false,
             suppressPreviewDotNetMessage: false,
@@ -39,7 +38,7 @@ public async Task EnableAspireProperty_WhenUsingVSTest_AllowsToRunAspireTests()
         dotnetTestResult.AssertOutputContains("Passed!  - Failed:     0, Passed:     1, Skipped:     0, Total:     1");
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public const string AspireProjectName = "AspireProject";
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AssemblyCleanupTests.cs

@@ -26,7 +26,7 @@ In AsmCleanup
             """);
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public const string ProjectName = "AssemblyCleanupTests";
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AssemblyResolutionTests.cs

@@ -68,7 +68,7 @@ public void Dispose()
         public async Task InitializeAsync(CancellationToken cancellationToken)
         {
             VSSolution solution = CreateTestAsset();
-            DotnetMuxerResult result = await DotnetCli.RunAsync($"build {solution.SolutionFile} -c Release", AcceptanceFixture.NuGetGlobalPackagesFolder.Path, cancellationToken: cancellationToken);
+            DotnetMuxerResult result = await DotnetCli.RunAsync($"build {solution.SolutionFile} -c Release", cancellationToken: cancellationToken);
             result.AssertExitCodeIs(0);
 
             TestHost = TestHost.LocateFrom(solution.Projects.Skip(1).Single().FolderPath, TestProjectName, TargetFramework);

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AssemblyResolverTests.cs

@@ -24,7 +24,7 @@ public async Task RunningTests_DoesNotHitResourceRecursionIssueAndDoesNotCrashTh
         testHostResult.AssertExitCodeIs(ExitCodes.Success);
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public string TargetAssetPath => GetAssetPath(AssetName);
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/CancellationTests.cs

@@ -128,7 +128,7 @@ public async Task WhenCancelingTestContextTokenInTestMethod_MessageIsAsExpected(
         testHostResult.AssertOutputContains("Failed!");
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public const string ProjectName = "TestCancellation";
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ConfigurationMSTestSettingsTests.cs

@@ -24,7 +24,7 @@ public async Task TestConfigJson_AndRunSettingsHasMstest_Throws(string tfm)
         testHostResult.AssertStandardErrorContains("Both '.runsettings' and '.testconfig.json' files have been detected. Please select only one of these test configuration files.");
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public const string ProjectNameWithMSTestRunSettings = "ConfigurationMSTestSettings";
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ConfigurationMSTestV2SettingsTests.cs

@@ -24,7 +24,7 @@ public async Task TestConfigJson_AndRunSettingsHasMstestv2_Throws(string tfm)
         testHostResult.AssertStandardErrorContains("Both '.runsettings' and '.testconfig.json' files have been detected. Please select only one of these test configuration files.");
     }
 
-    public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)
+    public sealed class TestAssetFixture() : TestAssetFixtureBase()
     {
         public const string ProjectNameWithMSTestV2RunSettings = "ConfigurationMSTestV2Settings";