Update tests after global.json update

dotnet · mariam-abdulla · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
commit 1d22160990d24b8bd68f6d5b129265cd9fdb205c
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -67,8 +67,6 @@
     <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
-    <PackageVersion Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformPackageVersion)" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingExtensionsTrxReportVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.26" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -223,14 +223,6 @@
     <Dependency Name="Microsoft.TestPlatform.Build" Version="17.13.0-preview-24610-01">
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>fc785088a28006c774dcfe0916b69ff54e6f99c1</Sha>
-    </Dependency>
-	<Dependency Name="Microsoft.Testing.Platform" Version="1.5.0-preview.24516.3">
-      <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>bc9161306b23641b0364b8f93d546da4d48da1eb</Sha>
-    </Dependency>
-	<Dependency Name="Microsoft.Testing.Extensions.TrxReport" Version="1.5.0-preview.24516.3">
-      <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>bc9161306b23641b0364b8f93d546da4d48da1eb</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
     <Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.13.0-preview-24610-01">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -182,10 +182,6 @@
     <!-- Dependencies from https://github.com/Microsoft/testfx -->
     <MicrosoftTestingPlatformPackageVersion>1.7.0-dev</MicrosoftTestingPlatformPackageVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependencies from https://github.com/Microsoft/testfx -->
-    <MicrosoftTestingExtensionsTrxReportVersion>1.7.0-dev</MicrosoftTestingExtensionsTrxReportVersion>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.24605.1</MicrosoftCodeAnalysisNetAnalyzersVersion>

@@ -200,7 +200,7 @@ private async Task<int> StartProcess(ProcessStartInfo processStartInfo)
         {
             if (VSTestTrace.TraceEnabled)
             {
-                VSTestTrace.SafeWriteTrace(() => $"Updated args: {processStartInfo.Arguments}");
+                VSTestTrace.SafeWriteTrace(() => $"Test application arguments: {processStartInfo.Arguments}");
             }
 
             var process = Process.Start(processStartInfo);

diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json b/test/TestAssets/TestProjects/MSTestMetaPackageProjectWithMultipleTFMsSolution/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDifferentFailures/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithDiscoveredTests/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json b/test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json b/test/TestAssets/TestProjects/MultipleTestProjectSolution/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json b/test/TestAssets/TestProjects/ProjectSolutionForMultipleTFMs/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolution/global.json b/test/TestAssets/TestProjects/TestProjectSolution/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json b/test/TestAssets/TestProjects/TestProjectWithDiscoveredTests/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
diff --git a/test/TestAssets/TestProjects/TestProjectWithTests/global.json b/test/TestAssets/TestProjects/TestProjectWithTests/global.json
@@ -0,0 +1,7 @@
+{
+	"test" : {	
+		"runner": {
+			"name": "MicrosoftTestingPlatform"
+		}
+	}	
+}
@@ -22,7 +22,6 @@ public void DiscoverTestProjectWithNoTests_ShouldReturnOneAsExitCode(string conf
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute("--list-tests", TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -46,7 +45,6 @@ public void DiscoverMultipleTestProjectsWithNoTests_ShouldReturnOneAsExitCode(st
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute("--list-tests", TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -115,7 +113,6 @@ public void DiscoverProjectWithMSTestMetaPackageAndMultipleTFMsWithTests_ShouldR
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute("--list-tests", TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -138,7 +135,6 @@ public void DiscoverTestProjectsWithHybridModeTestRunners_ShouldReturnOneAsExitC
             //.WithTraceOutput() should be removed later on
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute("--list-tests", TestingPlatformOptions.ConfigurationOption.Name, configuration);
 

@@ -21,7 +21,6 @@ public void RunHelpOnTestProject_ShouldReturnZeroAsExitCode(string configuration
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute(CliConstants.HelpOptionKey, TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
@@ -44,7 +43,6 @@ public void RunHelpOnMultipleTestProjects_ShouldReturnZeroAsExitCode(string conf
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute(CliConstants.HelpOptionKey, TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
@@ -73,7 +71,6 @@ public void RunHelpOnTestProjectsWithHybridModeTestRunners_ShouldReturnOneAsExit
             //.WithTraceOutput() should be removed later
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute(CliConstants.HelpOptionKey, TestingPlatformOptions.ConfigurationOption.Name, configuration);
 

@@ -32,7 +32,6 @@ public void RunTestProjectWithFilterOfDll_ShouldReturnZeroAsExitCode(string conf
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.TestModulesFilterOption.Name, "**/bin/**/Debug/net8.0/TestProject.dll",
                                     TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
@@ -66,7 +65,6 @@ public void RunTestProjectWithFilterOfDllWithRootDirectory_ShouldReturnZeroAsExi
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute(TestingPlatformOptions.TestModulesFilterOption.Name, "**/bin/**/Debug/net8.0/TestProject.dll",
                                     TestingPlatformOptions.TestModulesRootDirectoryOption.Name, testInstance.TestRoot,

@@ -22,7 +22,6 @@ public void RunTestProjectWithNoTests_ShouldReturnOneAsExitCode(string configura
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -48,7 +47,6 @@ public void RunMultipleTestProjectsWithNoTests_ShouldReturnOneAsExitCode(string
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -74,7 +72,6 @@ public void RunTestProjectWithTests_ShouldReturnZeroAsExitCode(string configurat
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -101,7 +98,6 @@ public void RunMultipleTestProjectsWithFailingTests_ShouldReturnOneAsExitCode(st
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -127,7 +123,6 @@ public void RunMultipleTestProjectsWithDifferentFailures_ShouldReturnOneAsExitCo
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute("--minimum-expected-tests 2",
                                     TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
@@ -159,7 +154,6 @@ public void RunTestProjectsWithHybridModeTestRunners_ShouldReturnOneAsExitCode(s
             //.WithTraceOutput() should be removed later
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .WithTraceOutput()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 

@@ -23,7 +23,6 @@ public void RunMultipleProjectWithDifferentTFMsWithFailingTests_ShouldReturnOneA
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -63,7 +62,6 @@ public void RunProjectWithMultipleTFMsWithFailingTests_ShouldReturnOneAsExitCode
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -110,7 +108,6 @@ public void RunProjectWithMSTestMetaPackageAndMultipleTFMsWithFailingTests_Shoul
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())

@@ -22,7 +22,6 @@ public void RunTestProjectWithFailingTestsAndFileArtifacts_ShouldReturnOneAsExit
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute(TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())
@@ -54,7 +53,6 @@ public void RunTestProjectWithCodeCoverage_ShouldReturnOneAsExitCode(string conf
 
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false)
                                     .WithWorkingDirectory(testInstance.Path)
-                                    .WithEnableTestingPlatform()
                                     .Execute("--coverage", TestingPlatformOptions.ConfigurationOption.Name, configuration);
 
             if (!TestContext.IsLocalized())