Fix --no-build option bug (#42729)

dotnet · Aug 14, 2024 · 5f9ca64 · 5f9ca64
1 parent 71a23de
commit 5f9ca64
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs
@@ -11,26 +11,32 @@ internal static class TestCommandParser
     {
         public static readonly string DocsLink = "https://aka.ms/dotnet-test";
 
-        public static readonly CliOption<string> MaxParallelTestModules = new ForwardedOption<string>("--max-parallel-test-modules", "-mptm")
+        public static readonly CliOption<string> MaxParallelTestModules = new("--max-parallel-test-modules", "-mptm")
         {
             Description = LocalizableStrings.CmdMaxParallelTestModulesDescription,
         };
 
-        public static readonly CliOption<string> AdditionalMSBuildParameters = new ForwardedOption<string>("--additional-msbuild-parameters")
+        public static readonly CliOption<string> AdditionalMSBuildParameters = new("--additional-msbuild-parameters")
         {
             Description = LocalizableStrings.CmdAdditionalMSBuildParametersDescription,
         };
 
-        public static readonly CliOption<string> TestModules = new ForwardedOption<string>("--test-modules")
+        public static readonly CliOption<string> TestModules = new("--test-modules")
         {
             Description = LocalizableStrings.CmdTestModulesDescription
         };
 
-        public static readonly CliOption<string> TestModulesRootDirectory = new ForwardedOption<string>("--root-directory")
+        public static readonly CliOption<string> TestModulesRootDirectory = new("--root-directory")
         {
             Description = LocalizableStrings.CmdTestModulesRootDirectoryDescription
         };
 
+        public static readonly CliOption<string> NoBuild = new("--no-build")
+        {
+            Description = LocalizableStrings.CmdNoBuildDescription,
+            Arity = ArgumentArity.Zero
+        };
+
         public static readonly CliOption<string> SettingsOption = new ForwardedOption<string>("--settings", "-s")
         {
             Description = LocalizableStrings.CmdSettingsDescription,
@@ -215,6 +221,7 @@ private static CliCommand GetTestingPlatformCliCommand()
             command.Options.Add(AdditionalMSBuildParameters);
             command.Options.Add(TestModules);
             command.Options.Add(TestModulesRootDirectory);
+            command.Options.Add(NoBuild);
 
             return command;
         }

diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs b/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs
@@ -148,10 +148,9 @@ private static IEnumerable<string> GetMatchedModulePaths(string testModules, str
 
         private int RunWithMSBuild(ParseResult parseResult)
         {
-            bool containsNoBuild = parseResult.UnmatchedTokens.Any(token => token == CliConstants.NoBuildOptionKey);
             List<string> msbuildCommandLineArgs =
                 [
-                    $"-t:{(containsNoBuild ? string.Empty : "Build;")}_GetTestsProject",
+                    $"-t:{(parseResult.HasOption(TestCommandParser.NoBuild) ? string.Empty : "Build;")}_GetTestsProject",
                     $"-p:GetTestsProjectPipeName={_pipeNameDescription.Name}",
                     "-verbosity:q"
                 ];