Subcommands 1

Author: tmat

src/Cli/dotnet/Commands/Build/BuildCommandDefinition.cs

@@ -65,7 +65,7 @@ public static Command Create()
         DocumentedCommand command = new("build", DocsLink, CliCommandStrings.BuildAppFullName);
 
         command.Arguments.Add(SlnOrProjectOrFileArgument);
-        RestoreCommandParser.AddImplicitRestoreOptions(command, includeRuntimeOption: false, includeNoDependenciesOption: false);
+        RestoreCommandDefinition.AddImplicitRestoreOptions(command, includeRuntimeOption: false, includeNoDependenciesOption: false);
         command.Options.Add(FrameworkOption);
         command.Options.Add(ConfigurationOption);
         command.Options.Add(RuntimeOption);

src/Cli/dotnet/Commands/Build/BuildCommandParser.cs

@@ -2,20 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli.Commands.Build;
 
 internal static class BuildCommandParser
 {
-    private static readonly Command Command = ConfigureCommand(BuildCommandDefinition.Create());
+    private static readonly Command Command = SetAction(BuildCommandDefinition.Create());
 
     public static Command GetCommand()
     {
         return Command;
     }
 
-    private static Command ConfigureCommand(Command command)
+    private static Command SetAction(Command command)
     {
         command.SetAction(BuildCommand.Run);
         return command;

src/Cli/dotnet/Commands/BuildServer/BuildServerCommandDefinition.cs

@@ -1,23 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Commands.BuildServer.Shutdown;
-using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli.Commands.BuildServer;
 
 internal static class BuildServerCommandDefinition
 {
+    public const string Name = "build-server";
     public static readonly string DocsLink = "https://aka.ms/dotnet-build-server";
 
     public static Command Create()
     {
-        var command = new DocumentedCommand("build-server", DocsLink, CliCommandStrings.BuildServerCommandDescription);
+        var command = new DocumentedCommand(Name, DocsLink, CliCommandStrings.BuildServerCommandDescription);
 
-        command.Subcommands.Add(BuildServerShutdownCommandParser.GetCommand());
+        command.Subcommands.Add(BuildServerShutdownCommandDefinition.Create());
 
         return command;
     }

src/Cli/dotnet/Commands/BuildServer/BuildServerCommandParser.cs

@@ -2,22 +2,24 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using Microsoft.DotNet.Cli.Commands.BuildServer.Shutdown;
 using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli.Commands.BuildServer;
 
 internal static class BuildServerCommandParser
 {
-    private static readonly Command Command = ConfigureCommand(BuildServerCommandDefinition.Create());
+    private static readonly Command Command = SetAction(BuildServerCommandDefinition.Create());
 
     public static Command GetCommand()
     {
         return Command;
     }
 
-    private static Command ConfigureCommand(Command command)
+    private static Command SetAction(Command command)
     {
         command.SetAction((parseResult) => parseResult.HandleMissingCommand());
+        command.Subcommands.Single(c => c.Name == BuildServerCommandDefinition.Name).SetAction((parseResult) => new BuildServerShutdownCommand(parseResult).Execute());
         return command;
     }
 }

src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommand.cs

@@ -25,9 +25,9 @@ public BuildServerShutdownCommand(
         IReporter reporter = null)
         : base(result)
     {
-        bool msbuild = result.GetValue(BuildServerShutdownCommandParser.MSBuildOption);
-        bool vbcscompiler = result.GetValue(BuildServerShutdownCommandParser.VbcsOption);
-        bool razor = result.GetValue(BuildServerShutdownCommandParser.RazorOption);
+        bool msbuild = result.GetValue(BuildServerShutdownCommandDefinition.MSBuildOption);
+        bool vbcscompiler = result.GetValue(BuildServerShutdownCommandDefinition.VbcsOption);
+        bool razor = result.GetValue(BuildServerShutdownCommandDefinition.RazorOption);
         bool all = !msbuild && !vbcscompiler && !razor;
 
         _enumerationFlags = ServerEnumerationFlags.None;

src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandParser.cs renamed to src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandDefinition.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.DotNet.Cli.Commands.BuildServer.Shutdown;
 
-internal static class BuildServerShutdownCommandParser
+internal static class BuildServerShutdownCommandDefinition
 {
     public static readonly Option<bool> MSBuildOption = new("--msbuild")
     {
@@ -27,23 +27,14 @@ internal static class BuildServerShutdownCommandParser
         Arity = ArgumentArity.Zero
     };
 
-    private static readonly Command Command = ConstructCommand();
-
-    public static Command GetCommand()
-    {
-        return Command;
-    }
-
-    private static Command ConstructCommand()
+    public static Command Create()
     {
         Command command = new("shutdown", CliCommandStrings.BuildServerShutdownCommandDescription);
 
         command.Options.Add(MSBuildOption);
         command.Options.Add(VbcsOption);
         command.Options.Add(RazorOption);
 
-        command.SetAction((parseResult) => new BuildServerShutdownCommand(parseResult).Execute());
-
         return command;
     }
 }

src/Cli/dotnet/Commands/Clean/CleanCommandDefinition.cs

@@ -56,7 +56,7 @@ public static Command Create()
         command.Options.Add(CommonOptions.GetItemOption);
         command.Options.Add(CommonOptions.GetTargetResultOption);
         command.Options.Add(CommonOptions.GetResultOutputFileOption);
-        command.Subcommands.Add(CleanFileBasedAppArtifactsCommandParser.Command);
+        command.Subcommands.Add(CleanFileBasedAppArtifactsCommandDefinition.Create());
 
         return command;
     }

src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs

@@ -3,23 +3,25 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Commands.Clean.FileBasedAppArtifacts;
-using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli.Commands.Clean;
 
 internal static class CleanCommandParser
 {
-
-    private static readonly Command Command = ConfigureCommand(CleanCommandDefinition.Create());
+    private static readonly Command Command = SetAction(CleanCommandDefinition.Create());
 
     public static Command GetCommand()
     {
         return Command;
     }
 
-    private static Command ConfigureCommand(Command command)
+    private static Command SetAction(Command command)
     {
         command.SetAction(CleanCommand.Run);
+
+        command.Subcommands.Single(c => c.Name == CleanFileBasedAppArtifactsCommandDefinition.Name)
+            .SetAction(parseResult => new CleanFileBasedAppArtifactsCommand(parseResult).Execute());
+
         return command;
     }
 }

src/Cli/dotnet/Commands/Clean/FileBasedAppArtifacts/CleanFileBasedAppArtifactsCommand.cs

@@ -14,7 +14,7 @@ internal sealed class CleanFileBasedAppArtifactsCommand(ParseResult parseResult)
 {
     public override int Execute()
     {
-        bool dryRun = _parseResult.GetValue(CleanFileBasedAppArtifactsCommandParser.DryRunOption);
+        bool dryRun = _parseResult.GetValue(CleanFileBasedAppArtifactsCommandDefinition.DryRunOption);
 
         using var metadataFileStream = OpenMetadataFile();
 
@@ -70,7 +70,7 @@ private IEnumerable<DirectoryInfo> GetFoldersToRemove()
 
         Reporter.Output.WriteLine(CliCommandStrings.CleanFileBasedAppArtifactsScanning, directory.FullName);
 
-        var days = _parseResult.GetValue(CleanFileBasedAppArtifactsCommandParser.DaysOption);
+        var days = _parseResult.GetValue(CleanFileBasedAppArtifactsCommandDefinition.DaysOption);
         var cutoff = DateTime.UtcNow.AddDays(-days);
 
         foreach (var subdir in directory.GetDirectories())
@@ -89,7 +89,7 @@ private static FileInfo GetMetadataFile()
 
     private FileStream? OpenMetadataFile()
     {
-        if (!_parseResult.GetValue(CleanFileBasedAppArtifactsCommandParser.AutomaticOption))
+        if (!_parseResult.GetValue(CleanFileBasedAppArtifactsCommandDefinition.AutomaticOption))
         {
             return null;
         }
@@ -127,8 +127,8 @@ public static void StartAutomaticCleanupIfNeeded()
                 Arguments = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(
                 [
                     CleanCommandParser.GetCommand().Name,
-                    CleanFileBasedAppArtifactsCommandParser.Command.Name,
-                    CleanFileBasedAppArtifactsCommandParser.AutomaticOption.Name,
+                    CleanFileBasedAppArtifactsCommandDefinition.Name,
+                    CleanFileBasedAppArtifactsCommandDefinition.AutomaticOption.Name,
                 ]),
                 UseShellExecute = false,
                 RedirectStandardInput = true,

src/Cli/dotnet/Commands/Clean/FileBasedAppArtifacts/CleanFileBasedAppArtifactsCommandParser.cs renamed to src/Cli/dotnet/Commands/Clean/FileBasedAppArtifacts/CleanFileBasedAppArtifactsCommandDefinition.cs

@@ -5,8 +5,10 @@
 
 namespace Microsoft.DotNet.Cli.Commands.Clean.FileBasedAppArtifacts;
 
-internal sealed class CleanFileBasedAppArtifactsCommandParser
+internal sealed class CleanFileBasedAppArtifactsCommandDefinition
 {
+    public const string Name = "file-based-apps";
+
     public static readonly Option<bool> DryRunOption = new("--dry-run")
     {
         Description = CliCommandStrings.CleanFileBasedAppArtifactsDryRun,
@@ -28,11 +30,8 @@ internal sealed class CleanFileBasedAppArtifactsCommandParser
         Hidden = true,
     };
 
-    public static Command Command => field ??= ConstructCommand();
-
-    private static Command ConstructCommand()
-    {
-        Command command = new("file-based-apps", CliCommandStrings.CleanFileBasedAppArtifactsCommandDescription)
+    public static Command Create()
+        => new(Name, CliCommandStrings.CleanFileBasedAppArtifactsCommandDescription)
         {
             Hidden = true,
             Options =
@@ -42,8 +41,4 @@ private static Command ConstructCommand()
                 AutomaticOption,
             },
         };
-
-        command.SetAction((parseResult) => new CleanFileBasedAppArtifactsCommand(parseResult).Execute());
-        return command;
-    }
 }