Resolve merge conflict by adapting to refactored TestCommandDefinition

Copilot · marcpopMSFT · Copilot · commit 07ef2e52fc28 · 2025-11-20T20:16:16.000Z
- TestCommandParser was refactored in main branch with options moved to TestCommandDefinition
- Added SelfContainedOption and NoSelfContainedOption to TestCommandDefinition
- Added options to both ConfigureVSTestCommand and ConfigureTestingPlatformCommand
- Updated all references from TestCommandParser to TestCommandDefinition throughout codebase
- Fixed validation in TestCommand and MicrosoftTestingPlatformTestCommand to use TestCommandDefinition

Co-authored-by: marcpopMSFT &lt;12663534+marcpopMSFT@users.noreply.github.com&gt;
diff --git a/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs b/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs
@@ -104,7 +104,7 @@ public static BuildOptions GetBuildOptions(ParseResult parseResult)
             pathOptions,
             parseResult.GetValue(CommonOptions.NoRestoreOption),
             parseResult.GetValue(MicrosoftTestingPlatformOptions.NoBuildOption),
-            parseResult.HasOption(TestCommandParser.VerbosityOption) ? parseResult.GetValue(TestCommandParser.VerbosityOption) : null,
+            parseResult.HasOption(TestCommandDefinition.VerbosityOption) ? parseResult.GetValue(TestCommandDefinition.VerbosityOption) : null,
             parseResult.GetValue(MicrosoftTestingPlatformOptions.NoLaunchProfileOption),
             parseResult.GetValue(MicrosoftTestingPlatformOptions.NoLaunchProfileArgumentsOption),
             otherArgs,
@@ -124,7 +124,7 @@ private static bool BuildOrRestoreProjectOrSolution(string filePath, BuildOption
             msbuildArgs.Add($"-verbosity:quiet");
         }
 
-        var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandParser.MTPTargetOption, TestCommandParser.VerbosityOption, CommonOptions.NoLogoOption());
+        var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandDefinition.MTPTargetOption, TestCommandDefinition.VerbosityOption, CommonOptions.NoLogoOption());
 
         int result = new RestoringCommand(parsedMSBuildArgs, buildOptions.HasNoRestore).Execute();
 
diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs
@@ -41,8 +41,8 @@ private int RunInternal(ParseResult parseResult, bool isHelp)
         ValidationUtility.ValidateSolutionOrProjectOrDirectoryOrModulesArePassedCorrectly(parseResult);
 
         CommonOptions.ValidateSelfContainedOptions(
-            parseResult.HasOption(TestCommandParser.SelfContainedOption),
-            parseResult.HasOption(TestCommandParser.NoSelfContainedOption));
+            parseResult.HasOption(TestCommandDefinition.SelfContainedOption),
+            parseResult.HasOption(TestCommandDefinition.NoSelfContainedOption));
 
         int degreeOfParallelism = GetDegreeOfParallelism(parseResult);
         var testOptions = new TestOptions(
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandDefinition.cs b/src/Cli/dotnet/Commands/Test/TestCommandDefinition.cs
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
diff --git a/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs b/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs
@@ -24,8 +24,8 @@ public static int Run(ParseResult parseResult)
         parseResult.HandleDebugSwitch();
 
         CommonOptions.ValidateSelfContainedOptions(
-            parseResult.HasOption(TestCommandParser.SelfContainedOption),
-            parseResult.HasOption(TestCommandParser.NoSelfContainedOption));
+            parseResult.HasOption(TestCommandDefinition.SelfContainedOption),
+            parseResult.HasOption(TestCommandDefinition.NoSelfContainedOption));
 
         FeatureFlag.Instance.PrintFlagFeatureState();
 
@@ -237,14 +237,14 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
             msbuildArgs.Add($"-property:VSTestSessionCorrelationId={testSessionCorrelationId}");
         }
 
-        bool noRestore = result.GetValue(TestCommandParser.NoRestoreOption) || result.GetValue(TestCommandParser.NoBuildOption);
+        bool noRestore = result.GetValue(TestCommandDefinition.NoRestoreOption) || result.GetValue(TestCommandDefinition.NoBuildOption);
 
         var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(
             msbuildArgs,
             CommonOptions.PropertiesOption,
             CommonOptions.RestorePropertiesOption,
-            TestCommandParser.VsTestTargetOption,
-            TestCommandParser.VerbosityOption,
+            TestCommandDefinition.VsTestTargetOption,
+            TestCommandDefinition.VerbosityOption,
             CommonOptions.NoLogoOption())
             .CloneWithNoLogo(true);
 
@@ -292,9 +292,9 @@ internal static int RunArtifactPostProcessingIfNeeded(string testSessionCorrelat
 
         var artifactsPostProcessArgs = new List<string> { "--artifactsProcessingMode-postprocess", $"--testSessionCorrelationId:{testSessionCorrelationId}" };
 
-        if (parseResult.GetResult(TestCommandParser.DiagOption) is not null)
+        if (parseResult.GetResult(TestCommandDefinition.DiagOption) is not null)
         {
-            artifactsPostProcessArgs.Add($"--diag:{parseResult.GetValue(TestCommandParser.DiagOption)}");
+            artifactsPostProcessArgs.Add($"--diag:{parseResult.GetValue(TestCommandDefinition.DiagOption)}");
         }
 
         try
diff --git a/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs b/src/Cli/dotnet/Extensions/OptionForwardingExtensions.cs
@@ -30,7 +30,7 @@ public static Option<string> ForwardAsOutputPath(this Option<string> option, str
             {
                 //  Not sure if this is necessary, but this is what "dotnet test" previously did and so we are
                 //  preserving the behavior here after refactoring
-                argVal = TestCommandParser.SurroundWithDoubleQuotes(argVal);
+                argVal = TestCommandDefinition.SurroundWithDoubleQuotes(argVal);
             }
             return [
                 $"--property:{outputPropertyName}={argVal}",
diff --git a/src/Cli/dotnet/Telemetry/TelemetryFilter.cs b/src/Cli/dotnet/Telemetry/TelemetryFilter.cs
@@ -118,8 +118,8 @@ PublishCommandParser.ConfigurationOption ]
         (
             topLevelCommandName: ["run", "clean", "test"],
             optionsToLog: [ RunCommandParser.FrameworkOption, CleanCommandParser.FrameworkOption,
-                TestCommandParser.FrameworkOption, RunCommandParser.ConfigurationOption, CleanCommandParser.ConfigurationOption,
-                TestCommandParser.ConfigurationOption ]
+                TestCommandDefinition.FrameworkOption, RunCommandParser.ConfigurationOption, CleanCommandParser.ConfigurationOption,
+                TestCommandDefinition.ConfigurationOption ]
         ),
         new TopLevelCommandNameAndOptionToLog
         (
diff --git a/test/dotnet.Tests/CommandTests/Test/TestCommandParserTests.cs b/test/dotnet.Tests/CommandTests/Test/TestCommandParserTests.cs
@@ -13,7 +13,7 @@ public class TestCommandParserTests
         public void SurroundWithDoubleQuotesWithNullThrows()
         {
             Assert.Throws<ArgumentNullException>(() =>
-                TestCommandParser.SurroundWithDoubleQuotes(null!));
+                TestCommandDefinition.SurroundWithDoubleQuotes(null!));
         }
 
         [Theory]
@@ -23,7 +23,7 @@ public void SurroundWithDoubleQuotesWithNullThrows()
         public void SurroundWithDoubleQuotesWhenAlreadySurroundedDoesNothing(string input)
         {
             var escapedInput = "\"" + input + "\"";
-            var result = TestCommandParser.SurroundWithDoubleQuotes(escapedInput);
+            var result = TestCommandDefinition.SurroundWithDoubleQuotes(escapedInput);
             result.Should().Be(escapedInput);
         }
 
@@ -35,7 +35,7 @@ public void SurroundWithDoubleQuotesWhenAlreadySurroundedDoesNothing(string inpu
         [InlineData("a\"")]
         public void SurroundWithDoubleQuotesWhenNotSurroundedSurrounds(string input)
         {
-            var result = TestCommandParser.SurroundWithDoubleQuotes(input);
+            var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);
             result.Should().Be("\"" + input + "\"");
         }
 
@@ -46,7 +46,7 @@ public void SurroundWithDoubleQuotesWhenNotSurroundedSurrounds(string input)
         [InlineData("/\\/\\/\\\\")]
         public void SurroundWithDoubleQuotesHandlesCorrectlyEvenCountOfTrailingBackslashes(string input)
         {
-            var result = TestCommandParser.SurroundWithDoubleQuotes(input);
+            var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);
             result.Should().Be("\"" + input + "\"");
         }
 
@@ -57,7 +57,7 @@ public void SurroundWithDoubleQuotesHandlesCorrectlyEvenCountOfTrailingBackslash
         [InlineData("/\\/\\/\\")]
         public void SurroundWithDoubleQuotesHandlesCorrectlyOddCountOfTrailingBackslashes(string input)
         {
-            var result = TestCommandParser.SurroundWithDoubleQuotes(input);
+            var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);
             result.Should().Be("\"" + input + "\\\"");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static Option<string> ForwardAsOutputPath(this Option<string> option, str`
`30`	`30`	`{`
`31`	`31`	`// Not sure if this is necessary, but this is what "dotnet test" previously did and so we are`
`32`	`32`	`// preserving the behavior here after refactoring`
`33`		`- argVal = TestCommandParser.SurroundWithDoubleQuotes(argVal);`
	`33`	`+ argVal = TestCommandDefinition.SurroundWithDoubleQuotes(argVal);`
`34`	`34`	`}`
`35`	`35`	`return [`
`36`	`36`	`$"--property:{outputPropertyName}={argVal}",`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,8 @@ PublishCommandParser.ConfigurationOption ]`
`118`	`118`	`(`
`119`	`119`	`topLevelCommandName: ["run", "clean", "test"],`
`120`	`120`	`optionsToLog: [ RunCommandParser.FrameworkOption, CleanCommandParser.FrameworkOption,`
`121`		`- TestCommandParser.FrameworkOption, RunCommandParser.ConfigurationOption, CleanCommandParser.ConfigurationOption,`
`122`		`- TestCommandParser.ConfigurationOption ]`
	`121`	`+ TestCommandDefinition.FrameworkOption, RunCommandParser.ConfigurationOption, CleanCommandParser.ConfigurationOption,`
	`122`	`+ TestCommandDefinition.ConfigurationOption ]`
`123`	`123`	`),`
`124`	`124`	`new TopLevelCommandNameAndOptionToLog`
`125`	`125`	`(`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class TestCommandParserTests`
`13`	`13`	`public void SurroundWithDoubleQuotesWithNullThrows()`
`14`	`14`	`{`
`15`	`15`	`Assert.Throws<ArgumentNullException>(() =>`
`16`		`- TestCommandParser.SurroundWithDoubleQuotes(null!));`
	`16`	`+ TestCommandDefinition.SurroundWithDoubleQuotes(null!));`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`[Theory]`
`@@ -23,7 +23,7 @@ public void SurroundWithDoubleQuotesWithNullThrows()`
`23`	`23`	`public void SurroundWithDoubleQuotesWhenAlreadySurroundedDoesNothing(string input)`
`24`	`24`	`{`
`25`	`25`	`var escapedInput = "\"" + input + "\"";`
`26`		`- var result = TestCommandParser.SurroundWithDoubleQuotes(escapedInput);`
	`26`	`+ var result = TestCommandDefinition.SurroundWithDoubleQuotes(escapedInput);`
`27`	`27`	`result.Should().Be(escapedInput);`
`28`	`28`	`}`
`29`	`29`
`@@ -35,7 +35,7 @@ public void SurroundWithDoubleQuotesWhenAlreadySurroundedDoesNothing(string inpu`
`35`	`35`	`[InlineData("a\"")]`
`36`	`36`	`public void SurroundWithDoubleQuotesWhenNotSurroundedSurrounds(string input)`
`37`	`37`	`{`
`38`		`- var result = TestCommandParser.SurroundWithDoubleQuotes(input);`
	`38`	`+ var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);`
`39`	`39`	`result.Should().Be("\"" + input + "\"");`
`40`	`40`	`}`
`41`	`41`
`@@ -46,7 +46,7 @@ public void SurroundWithDoubleQuotesWhenNotSurroundedSurrounds(string input)`
`46`	`46`	`[InlineData("/\\/\\/\\\\")]`
`47`	`47`	`public void SurroundWithDoubleQuotesHandlesCorrectlyEvenCountOfTrailingBackslashes(string input)`
`48`	`48`	`{`
`49`		`- var result = TestCommandParser.SurroundWithDoubleQuotes(input);`
	`49`	`+ var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);`
`50`	`50`	`result.Should().Be("\"" + input + "\"");`
`51`	`51`	`}`
`52`	`52`
`@@ -57,7 +57,7 @@ public void SurroundWithDoubleQuotesHandlesCorrectlyEvenCountOfTrailingBackslash`
`57`	`57`	`[InlineData("/\\/\\/\\")]`
`58`	`58`	`public void SurroundWithDoubleQuotesHandlesCorrectlyOddCountOfTrailingBackslashes(string input)`
`59`	`59`	`{`
`60`		`- var result = TestCommandParser.SurroundWithDoubleQuotes(input);`
	`60`	`+ var result = TestCommandDefinition.SurroundWithDoubleQuotes(input);`
`61`	`61`	`result.Should().Be("\"" + input + "\\\"");`
`62`	`62`	`}`
`63`	`63`