From 05deb03ddcc033fc6c734be14bfafdc306ecba95 Mon Sep 17 00:00:00 2001 From: mariam-abdulla Date: Wed, 14 Aug 2024 15:34:18 +0200 Subject: [PATCH 1/2] FIx --no-build option bug --- .../commands/dotnet-test/TestCommandParser.cs | 14 ++++++++++---- .../commands/dotnet-test/TestingPlatformCommand.cs | 3 +-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs index 1ff5416bf08e..0203a9c0f035 100644 --- 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 MaxParallelTestModules = new ForwardedOption("--max-parallel-test-modules", "-mptm") + public static readonly CliOption MaxParallelTestModules = new("--max-parallel-test-modules", "-mptm") { Description = LocalizableStrings.CmdMaxParallelTestModulesDescription, }; - public static readonly CliOption AdditionalMSBuildParameters = new ForwardedOption("--additional-msbuild-parameters") + public static readonly CliOption AdditionalMSBuildParameters = new("--additional-msbuild-parameters") { Description = LocalizableStrings.CmdAdditionalMSBuildParametersDescription, }; - public static readonly CliOption TestModules = new ForwardedOption("--test-modules") + public static readonly CliOption TestModules = new("--test-modules") { Description = LocalizableStrings.CmdTestModulesDescription }; - public static readonly CliOption TestModulesRootDirectory = new ForwardedOption("--root-directory") + public static readonly CliOption TestModulesRootDirectory = new("--root-directory") { Description = LocalizableStrings.CmdTestModulesRootDirectoryDescription }; + public static readonly CliOption NoBuild = new("--no-build") + { + Description = LocalizableStrings.CmdNoBuildDescription, + Arity = ArgumentArity.Zero + }; + public static readonly CliOption SettingsOption = new ForwardedOption("--settings", "-s") { Description = LocalizableStrings.CmdSettingsDescription, diff --git a/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs b/src/Cli/dotnet/commands/dotnet-test/TestingPlatformCommand.cs index 978c8deaa2d0..2bcc9e4ebac2 100644 --- 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 GetMatchedModulePaths(string testModules, str private int RunWithMSBuild(ParseResult parseResult) { - bool containsNoBuild = parseResult.UnmatchedTokens.Any(token => token == CliConstants.NoBuildOptionKey); List msbuildCommandLineArgs = [ - $"-t:{(containsNoBuild ? string.Empty : "Build;")}_GetTestsProject", + $"-t:{(parseResult.HasOption(TestCommandParser.NoBuild) ? string.Empty : "Build;")}_GetTestsProject", $"-p:GetTestsProjectPipeName={_pipeNameDescription.Name}", "-verbosity:q" ]; From 51727573775cfbb0e06038f964fda6a62c3d7f5a Mon Sep 17 00:00:00 2001 From: mariam-abdulla Date: Wed, 14 Aug 2024 15:35:28 +0200 Subject: [PATCH 2/2] Add --no-build to list of predefined options --- src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs index 0203a9c0f035..5857f4e0036f 100644 --- a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -221,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; }