fix the baseline

Author: Marco Rossignoli

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/SdkTests.cs

@@ -375,7 +375,7 @@ await RetryHelper.RetryAsync(
                    .PatchCodeWithReplace("$TestingPlatformDotnetTestSupport$", string.Empty)
                    .PatchCodeWithReplace("$ExtraProperties$", """
         <PublishAot>true</PublishAot>
-        <EnableMicrosoftTestingExtensionsCodeCoverage>false</EnableMicrosoftTestingExtensionsCodeCoverage>        
+        <EnableMicrosoftTestingExtensionsCodeCoverage>false</EnableMicrosoftTestingExtensionsCodeCoverage>
         """)
                    .PatchCodeWithReplace("$Extensions$", string.Empty),
                    addPublicFeeds: true);

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/testsbaseline.txt

@@ -71,6 +71,8 @@ MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.Messages.V
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.Invalid_TestingProfile_Name_Should_Fail(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Debug)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.Invalid_TestingProfile_Name_Should_Fail(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Release)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.NativeAot_Smoke_Test_On_Windows()
+MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_CentralPackageManagement_Standalone(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Debug)
+MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_CentralPackageManagement_Standalone(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Release)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_MSTestRunner_DotnetTest(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Debug)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_MSTestRunner_DotnetTest(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Release)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_MSTestRunner_Standalone(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Debug)
@@ -93,4 +95,4 @@ MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.R
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_MSTestRunner_Standalone_Selectively_Enabled_Extensions(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration, string, string, string) (multitfm,Release,TrxReport)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_VSTest(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Debug)
 MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.SdkTests.RunTests_With_VSTest(string, Microsoft.Testing.TestInfrastructure.BuildConfiguration) (multitfm,Release)
-MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.ValueTaskTests.CanUseValueTaskForAllKnownLocations()
+MSTest.Acceptance.IntegrationTests.MSTest.Acceptance.IntegrationTests.ValueTaskTests.CanUseValueTaskForAllKnownLocations()

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

@@ -92,17 +92,7 @@ public static async Task<DotnetMuxerResult> RunAsync(
 
             if (DoNotRetry)
             {
-                if (args.StartsWith("dotnet ", StringComparison.OrdinalIgnoreCase))
-                {
-                    throw new InvalidOperationException("Command should not start with 'dotnet'");
-                }
-
-                using var dotnet = new DotnetMuxer(environmentVariables);
-                int exitCode = await dotnet.Args(args, workingDirectory, timeoutInSeconds);
-
-                return exitCode != 0 && failIfReturnValueIsNotZero
-                    ? throw new InvalidOperationException($"Command 'dotnet {args}' failed.\n\nStandardOutput:\n{dotnet.StandardOutput}\nStandardError:\n{dotnet.StandardError}")
-                    : new DotnetMuxerResult(args, exitCode, dotnet.StandardOutput, dotnet.StandardOutputLines, dotnet.StandardError, dotnet.StandardErrorLines);
+                return await CallTheMuxer(args, environmentVariables, workingDirectory, timeoutInSeconds, failIfReturnValueIsNotZero);
             }
             else
             {
@@ -112,17 +102,7 @@ public static async Task<DotnetMuxerResult> RunAsync(
                     .WaitAndRetryAsync(delay)
                     .ExecuteAsync(async () =>
                     {
-                        if (args.StartsWith("dotnet ", StringComparison.OrdinalIgnoreCase))
-                        {
-                            throw new InvalidOperationException("Command should not start with 'dotnet'");
-                        }
-
-                        using var dotnet = new DotnetMuxer(environmentVariables);
-                        int exitCode = await dotnet.Args(args, workingDirectory, timeoutInSeconds);
-
-                        return exitCode != 0 && failIfReturnValueIsNotZero
-                            ? throw new InvalidOperationException($"Command 'dotnet {args}' failed.\n\nStandardOutput:\n{dotnet.StandardOutput}\nStandardError:\n{dotnet.StandardError}")
-                            : new DotnetMuxerResult(args, exitCode, dotnet.StandardOutput, dotnet.StandardOutputLines, dotnet.StandardError, dotnet.StandardErrorLines);
+                        return await CallTheMuxer(args, environmentVariables, workingDirectory, timeoutInSeconds, failIfReturnValueIsNotZero);
                     });
             }
         }
@@ -131,4 +111,19 @@ public static async Task<DotnetMuxerResult> RunAsync(
             s_maxOutstandingCommands_semaphore.Release();
         }
     }
+
+    private static async Task<DotnetMuxerResult> CallTheMuxer(string args, Dictionary<string, string> environmentVariables, string? workingDirectory, int timeoutInSeconds, bool failIfReturnValueIsNotZero)
+    {
+        if (args.StartsWith("dotnet ", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new InvalidOperationException("Command should not start with 'dotnet'");
+        }
+
+        using var dotnet = new DotnetMuxer(environmentVariables);
+        int exitCode = await dotnet.Args(args, workingDirectory, timeoutInSeconds);
+
+        return exitCode != 0 && failIfReturnValueIsNotZero
+            ? throw new InvalidOperationException($"Command 'dotnet {args}' failed.\n\nStandardOutput:\n{dotnet.StandardOutput}\nStandardError:\n{dotnet.StandardError}")
+            : new DotnetMuxerResult(args, exitCode, dotnet.StandardOutput, dotnet.StandardOutputLines, dotnet.StandardError, dotnet.StandardErrorLines);
+    }
 }