make some methods static (#4564)

src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs

@@ -629,7 +629,7 @@ private static async Task LogTestHostCreatedAsync(
         }
     }
 
-    private async Task<ITestFramework> BuildTestFrameworkAsync(TestFrameworkBuilderData testFrameworkBuilderData)
+    private static async Task<ITestFramework> BuildTestFrameworkAsync(TestFrameworkBuilderData testFrameworkBuilderData)
     {
         // Add the message bus proxy
         ServiceProvider serviceProvider = testFrameworkBuilderData.ServiceProvider;

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ParameterizedTestTests.cs

@@ -43,7 +43,7 @@ public async Task SendingEmptyDataToDynamicDataTest_WithoutSettingConsiderEmptyD
     public async Task SendingEmptyDataToDataSourceTest_WithoutSettingConsiderEmptyDataSourceAsInconclusive_Fails(string currentTfm)
         => await RunTestsAsync(currentTfm, DataSourceAssetName, null);
 
-    private async Task RunTestsAsync(string currentTfm, string assetName, bool? isEmptyDataInconclusive)
+    private static async Task RunTestsAsync(string currentTfm, string assetName, bool? isEmptyDataInconclusive)
     {
         var testHost = TestHost.LocateFrom(AssetFixture.GetAssetPath(assetName), assetName, currentTfm);
 

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ThreadContextTests.cs

@@ -33,7 +33,7 @@ public async Task ThreadingContext_WhenChangedInClassInitialize_IsPassedToTestMe
     public async Task ThreadingContext_WhenChangedInTestInitialize_IsPassedToTestMethod(string tfm)
         => await SetCultureInFixtureMethodAndRunTests(tfm, "MSTEST_TEST_SET_CULTURE_TEST_INIT");
 
-    private async Task SetCultureInFixtureMethodAndRunTests(string tfm, string envVarKey)
+    private static async Task SetCultureInFixtureMethodAndRunTests(string tfm, string envVarKey)
     {
         var testHost = TestHost.LocateFrom(AssetFixture.InitToTestProjectPath, TestAssetFixture.InitToTestProjectName, tfm);
         TestHostResult testHostResult = await testHost.ExecuteAsync(environmentVariables: new() { [envVarKey] = "true" });

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TimeoutTests.cs

@@ -362,21 +362,21 @@ public async Task CooperativeCancellation_WhenTestCleanupTimeoutExpiresAndUserCh
         testHostResult.AssertOutputContains("Test cleanup method 'TestClass.TestCleanup' timed out after 1000ms");
     }
 
-    private async Task RunAndAssertTestWasCanceledAsync(string rootFolder, string assetName, string tfm, string envVarPrefix, string entryKind)
+    private static async Task RunAndAssertTestWasCanceledAsync(string rootFolder, string assetName, string tfm, string envVarPrefix, string entryKind)
     {
         var testHost = TestHost.LocateFrom(rootFolder, assetName, tfm);
         TestHostResult testHostResult = await testHost.ExecuteAsync(environmentVariables: new() { { envVarPrefix + InfoByKind[entryKind].EnvVarSuffix, "1" } });
         testHostResult.AssertOutputContains($"{InfoByKind[entryKind].Prefix} method '{InfoByKind[entryKind].MethodFullName}' was canceled");
     }
 
-    private async Task RunAndAssertTestTimedOutAsync(string rootFolder, string assetName, string tfm, string envVarPrefix, string entryKind)
+    private static async Task RunAndAssertTestTimedOutAsync(string rootFolder, string assetName, string tfm, string envVarPrefix, string entryKind)
     {
         var testHost = TestHost.LocateFrom(rootFolder, assetName, tfm);
         TestHostResult testHostResult = await testHost.ExecuteAsync(environmentVariables: new() { { envVarPrefix + InfoByKind[entryKind].EnvVarSuffix, "1" } });
         testHostResult.AssertOutputContains($"{InfoByKind[entryKind].Prefix} method '{InfoByKind[entryKind].MethodFullName}' timed out after 1000ms");
     }
 
-    private async Task RunAndAssertWithRunSettingsAsync(string tfm, int timeoutValue, bool assertAttributePrecedence, string entryKind)
+    private static async Task RunAndAssertWithRunSettingsAsync(string tfm, int timeoutValue, bool assertAttributePrecedence, string entryKind)
     {
         string runSettingsEntry = InfoByKind[entryKind].RunSettingsEntryName;
         string runSettings = $"""

test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs

@@ -16,7 +16,7 @@ public class OutputTests : CLITestBase
 
     public void OutputIsNotMixedWhenAsyncTestsRunInParallel() => ValidateOutputForClass("UnitTest2");
 
-    private void ValidateOutputForClass(string className)
+    private static void ValidateOutputForClass(string className)
     {
         // LogMessageListener uses an implementation of a string writer that captures output per async context.
         // This allows us to capture output from tasks even when they are running in parallel.

test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs

@@ -19,7 +19,7 @@ namespace Microsoft.MSTestV2.CLIAutomation;
 
 public partial class CLITestBase : TestContainer
 {
-    internal ImmutableArray<TestCase> DiscoverTests(string assemblyPath, string testCaseFilter = null)
+    internal static ImmutableArray<TestCase> DiscoverTests(string assemblyPath, string testCaseFilter = null)
     {
         var unitTestDiscoverer = new UnitTestDiscoverer();
         var logger = new InternalLogger();
@@ -33,7 +33,7 @@ internal ImmutableArray<TestCase> DiscoverTests(string assemblyPath, string test
         return sink.DiscoveredTests;
     }
 
-    internal ImmutableArray<TestResult> RunTests(IEnumerable<TestCase> testCases)
+    internal static ImmutableArray<TestResult> RunTests(IEnumerable<TestCase> testCases)
     {
         var testExecutionManager = new TestExecutionManager();
         var frameworkHandle = new InternalFrameworkHandle();

test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/FixturesTests.cs

@@ -138,7 +138,7 @@ public void RunSingleTest_ClassInitialize_Failure_Runs_AssemblyFixtures()
         ValidatePassedTests([AssemblyInitialize, AssemblyCleanup, ClassCleanup]);
     }
 
-    private string GetRunSettings(bool fixturesEnabled, bool assemblyInitialize, bool assemblyCleanup, bool classInitialize, bool classCleanup, bool test)
+    private static string GetRunSettings(bool fixturesEnabled, bool assemblyInitialize, bool assemblyCleanup, bool classInitialize, bool classCleanup, bool test)
         => $@"<?xml version=""1.0"" encoding=""utf-8""?>
 <RunSettings>
     <RunConfiguration>

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/DiagnosticTests.cs

@@ -194,7 +194,7 @@ public async Task Diag_EnableWithEnvironmentVariables_Disable_Succeeded(string t
         testHostResult.AssertOutputContains("Diagnostic file");
     }
 
-    private async Task<string> AssertDiagnosticReportWasGeneratedAsync(TestHostResult testHostResult, string diagPathPattern, string level = "Trace", string flushType = "async")
+    private static async Task<string> AssertDiagnosticReportWasGeneratedAsync(TestHostResult testHostResult, string diagPathPattern, string level = "Trace", string flushType = "async")
     {
         testHostResult.AssertExitCodeIs(ExitCodes.ZeroTests);
 
@@ -218,7 +218,7 @@ private async Task<string> AssertDiagnosticReportWasGeneratedAsync(TestHostResul
         return match.Value;
     }
 
-    private async Task<(bool IsMatch, string Content)> CheckDiagnosticContentsMatchAsync(string path, string pattern)
+    private static async Task<(bool IsMatch, string Content)> CheckDiagnosticContentsMatchAsync(string path, string pattern)
     {
         using var reader = new StreamReader(path);
         string content = await reader.ReadToEndAsync();

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TelemetryTests.cs

@@ -110,7 +110,7 @@ public async Task Telemetry_WhenEnableTelemetryIsFalse_WithTestApplicationOption
         await AssertDiagnosticReportAsync(testHostResult, diagPathPattern, diagContentsPattern);
     }
 
-    private async Task<string> AssertDiagnosticReportAsync(TestHostResult testHostResult, string diagPathPattern, string diagContentsPattern, string level = "Trace", string flushType = "async")
+    private static async Task<string> AssertDiagnosticReportAsync(TestHostResult testHostResult, string diagPathPattern, string diagContentsPattern, string level = "Trace", string flushType = "async")
     {
         testHostResult.AssertExitCodeIs(ExitCodes.ZeroTests);
 
@@ -126,7 +126,7 @@ private async Task<string> AssertDiagnosticReportAsync(TestHostResult testHostRe
         return match.Value;
     }
 
-    private async Task<(bool IsMatch, string Content)> CheckDiagnosticContentsMatchAsync(string path, string pattern)
+    private static async Task<(bool IsMatch, string Content)> CheckDiagnosticContentsMatchAsync(string path, string pattern)
     {
         using var reader = new StreamReader(path);
         string content = await reader.ReadToEndAsync();

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs

@@ -188,7 +188,7 @@ private async Task AssertTrxReportWasGeneratedAsync(TestHostResult testHostResul
         Assert.IsTrue(await CheckTrxContentsMatchAsync(match.Value, trxContentsPattern), $"Output of the test host is:\n{testHostResult}");
     }
 
-    private async Task<bool> CheckTrxContentsMatchAsync(string path, string pattern)
+    private static async Task<bool> CheckTrxContentsMatchAsync(string path, string pattern)
     {
         using StreamReader reader = new(path);
         return Regex.IsMatch(await reader.ReadToEndAsync(), pattern);

test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/ReflectionUtilityTests.cs

@@ -246,7 +246,7 @@ public void GetSpecificCustomAttributesOnAssemblyShouldReturnAllAttributes()
         GetAttributeValuePairs(attributes).Should().Equal(expectedAttributes);
     }
 
-    private Assembly ReflectionOnlyOnResolve(object sender, ResolveEventArgs args)
+    private static Assembly ReflectionOnlyOnResolve(object sender, ResolveEventArgs args)
     {
         string assemblyNameToLoad = AppDomain.CurrentDomain.ApplyPolicy(args.Name);
 

test/Performance/MSTest.Performance.Runner/Steps/PerfviewRunner.cs

@@ -103,7 +103,7 @@ public async Task<Files> ExecuteAsync(BuildArtifact payload, IContext context)
         return new Files([sample]);
     }
 
-    private async Task<string> PerfviewExecutable()
+    private static async Task<string> PerfviewExecutable()
     {
         string localPath = Path.Combine(Path.GetTempPath(), "PerfView", "PerfView.exe");
         Directory.CreateDirectory(Path.GetDirectoryName(localPath)!);

test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestFixtureMethodSuppressorTests.cs

@@ -114,7 +114,7 @@ public override void Initialize(AnalysisContext context)
             context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
         }
 
-        private void AnalyzeSymbol(SymbolAnalysisContext context)
+        private static void AnalyzeSymbol(SymbolAnalysisContext context)
         {
             var method = (IMethodSymbol)context.Symbol;
             if (method.Name.EndsWith("Async", StringComparison.Ordinal))

test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestMethodSuppressorTests.cs

@@ -117,7 +117,7 @@ public override void Initialize(AnalysisContext context)
             context.RegisterSymbolAction(AnalyzeSymbol, SymbolKind.Method);
         }
 
-        private void AnalyzeSymbol(SymbolAnalysisContext context)
+        private static void AnalyzeSymbol(SymbolAnalysisContext context)
         {
             var method = (IMethodSymbol)context.Symbol;
             if (method.Name.EndsWith("Async", StringComparison.Ordinal))

test/UnitTests/MSTestAdapter.UnitTests/Discovery/UnitTestDiscovererTests.cs

@@ -367,7 +367,7 @@ private void SetupNavigation(string source, UnitTestElement test, string classNa
         SetTestCaseNavigationData(testCase1, testNavigationData.FileName, testNavigationData.MinLineNumber);
     }
 
-    private void SetTestCaseNavigationData(TestCase testCase, string fileName, int lineNumber)
+    private static void SetTestCaseNavigationData(TestCase testCase, string fileName, int lineNumber)
     {
         testCase.LineNumber = lineNumber;
         testCase.CodeFilePath = fileName;

test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs

@@ -1531,7 +1531,7 @@ public void ResolveArgumentsShouldReturnPopulatedParamsWithAllProvided()
 
     #region helper methods
 
-    private void RunWithTestablePlatformService(TestablePlatformServiceProvider testablePlatformServiceProvider, Action action)
+    private static void RunWithTestablePlatformService(TestablePlatformServiceProvider testablePlatformServiceProvider, Action action)
     {
         try
         {

test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationExtensionsTests.cs

@@ -10,7 +10,7 @@ namespace Microsoft.Testing.Platform.UnitTests;
 [TestClass]
 public sealed class ConfigurationExtensionsTests
 {
-    private string GetActualValueFromConfiguration(IConfiguration configuration, string key) => key switch
+    private static string GetActualValueFromConfiguration(IConfiguration configuration, string key) => key switch
     {
         PlatformConfigurationConstants.PlatformResultDirectory => configuration.GetTestResultDirectory(),
         PlatformConfigurationConstants.PlatformCurrentWorkingDirectory => configuration.GetCurrentWorkingDirectory(),

test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/FormatterUtilitiesTests.cs

@@ -103,7 +103,7 @@ public void DeserializeSpecificTypes(Type type)
         }
     }
 
-    private void AssertRequestArgs<TRequestArgs>(Type type, TRequestArgs actualRequest, TRequestArgs expectedRequest)
+    private static void AssertRequestArgs<TRequestArgs>(Type type, TRequestArgs actualRequest, TRequestArgs expectedRequest)
         where TRequestArgs : RequestArgsBase
     {
         Assert.AreEqual(expectedRequest.RunId, actualRequest.RunId);

test/Utilities/Automation.CLI/CLITestBase.e2e.cs

@@ -79,7 +79,7 @@ public static string GetNugetPackageFolder()
     /// Gets the path to <c>vstest.console.exe</c>.
     /// </summary>
     /// <returns>Full path to <c>vstest.console.exe</c>.</returns>
-    public string GetConsoleRunnerPath()
+    public static string GetConsoleRunnerPath()
     {
         string testPlatformNuGetPackageFolder = Path.Combine(
             GetNugetPackageFolder(),

test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetMuxer.cs

@@ -107,7 +107,7 @@ public async Task<int> ExecuteAsync(
             cleanDefaultEnvironmentVariableIfCustomAreProvided: true,
             timeoutInSeconds: timeoutInSeconds);
 
-    private IDictionary<string, string?> MergeEnvironmentVariables(
+    private static IDictionary<string, string?> MergeEnvironmentVariables(
         IDictionary<string, string?> environmentVariables1,
         IDictionary<string, string?> environmentVariables2)
     {