Workload command definitions

Author: tmat

src/Cli/dotnet/CommandLineInfo.cs

@@ -24,8 +24,8 @@ public static void PrintInfo()
         Reporter.Output.WriteLine($"{LocalizableStrings.DotNetSdkInfoLabel}");
         Reporter.Output.WriteLine($" Version:           {Product.Version}");
         Reporter.Output.WriteLine($" Commit:            {commitSha}");
-        Reporter.Output.WriteLine($" Workload version:  {WorkloadCommandDefinition.GetWorkloadsVersion()}");
-        Reporter.Output.WriteLine($" MSBuild version:   {MSBuildForwardingAppWithoutLogging.MSBuildVersion.ToString()}");
+        Reporter.Output.WriteLine($" Workload version:  {WorkloadInfoHelper.GetWorkloadsVersion()}");
+        Reporter.Output.WriteLine($" MSBuild version:   {MSBuildForwardingAppWithoutLogging.MSBuildVersion}");
         Reporter.Output.WriteLine();
         Reporter.Output.WriteLine($"{LocalizableStrings.DotNetRuntimeInfoLabel}");
         Reporter.Output.WriteLine($" OS Name:     {RuntimeEnvironment.OperatingSystem}");
@@ -40,7 +40,7 @@ private static void PrintWorkloadsInfo()
     {
         Reporter.Output.WriteLine();
         Reporter.Output.WriteLine($"{LocalizableStrings.DotnetWorkloadInfoLabel}");
-        WorkloadCommandDefinition.ShowWorkloadsInfo(showVersion: false);
+        new WorkloadInfoHelper(isInteractive: false).ShowWorkloadsInfo(showVersion: false);
     }
 
     private static string GetDisplayRid(DotnetVersionFile versionFile)

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

@@ -55,7 +55,7 @@ internal static class BuildCommandDefinition
     /// </summary>
     public static readonly Option<string[]?> TargetOption = CommonOptions.MSBuildTargetOption();
 
-    public static readonly Option<Utils.VerbosityOptions?> VerbosityOption = CommonOptions.VerbosityOption();
+    public static readonly Option<Utils.VerbosityOptions?> VerbosityOption = CommonOptions.CreateVerbosityOption();
 
     public static Command Create()
     {

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

@@ -32,7 +32,7 @@ internal static class CleanCommandDefinition
 
     public static readonly Option<string[]> TargetOption = CommonOptions.RequiredMSBuildTargetOption("Clean");
 
-    public static readonly Option<Utils.VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal);
+    public static readonly Option<Utils.VerbosityOptions> VerbosityOption = CommonOptions.CreateVerbosityOption(Utils.VerbosityOptions.normal);
 
     public static Command Create()
     {

src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs

@@ -16,7 +16,7 @@ public class MSBuildCommand(
         CommonOptions.PropertiesOption,
         CommonOptions.RestorePropertiesOption,
         MSBuildCommandDefinition.TargetOption,
-        CommonOptions.VerbosityOption(),
+        CommonOptions.CreateVerbosityOption(),
         // We set the no-logo option to false here to ensure that by default the logo is shown for this command.
         // This is different from other commands that default to hiding the logo - but this command is meant to mimic
         // the behavior of calling MSBuild directly, which shows the logo by default.

src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs

@@ -42,7 +42,7 @@ private static MSBuildArgs ConcatTelemetryLogger(MSBuildArgs msbuildArgs)
     /// Mostly intended for quick/one-shot usage - most 'core' SDK commands should do more hands-on parsing.
     /// </summary>
     public MSBuildForwardingApp(IEnumerable<string> rawMSBuildArgs, string? msbuildPath = null) : this(
-        MSBuildArgs.AnalyzeMSBuildArguments(rawMSBuildArgs.ToArray(), CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption()),
+        MSBuildArgs.AnalyzeMSBuildArguments(rawMSBuildArgs.ToArray(), CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.CreateVerbosityOption(), CommonOptions.NoLogoOption()),
         msbuildPath)
     {
     }

src/Cli/dotnet/Commands/NuGet/NuGetCommandDefinition.cs

@@ -57,7 +57,7 @@ private static Command CreateDeleteCommand()
         {
             Arity = ArgumentArity.Zero
         });
-        deleteCommand.Options.Add(CommonOptions.InteractiveOption());
+        deleteCommand.Options.Add(CommonOptions.CreateInteractiveOption());
 
         return deleteCommand;
     }
@@ -114,7 +114,7 @@ private static Command CreatePushCommand()
         {
             Arity = ArgumentArity.Zero
         });
-        pushCommand.Options.Add(CommonOptions.InteractiveOption());
+        pushCommand.Options.Add(CommonOptions.CreateInteractiveOption());
         pushCommand.Options.Add(new Option<bool>("--skip-duplicate")
         {
             Arity = ArgumentArity.Zero
@@ -138,7 +138,7 @@ private static Command CreateVerifyCommand()
         verifyCommand.Options.Add(new Option<IEnumerable<string>>(fingerprint)
             .ForwardAsManyArgumentsEachPrefixedByOption(fingerprint)
             .AllowSingleArgPerToken());
-        verifyCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        verifyCommand.Options.Add(CommonOptions.CreateVerbosityOption(Utils.VerbosityOptions.normal));
 
         return verifyCommand;
     }
@@ -167,12 +167,12 @@ private static Command CreateTrustCommand()
         // as well as the standard NugetCommand.Run handler
 
         trustCommand.Options.Add(configFile);
-        trustCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        trustCommand.Options.Add(CommonOptions.CreateVerbosityOption(Utils.VerbosityOptions.normal));
 
         foreach (var command in trustCommand.Subcommands)
         {
             command.Options.Add(configFile);
-            command.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+            command.Options.Add(CommonOptions.CreateVerbosityOption(Utils.VerbosityOptions.normal));
         }
 
         Command CreateAuthorCommand() => new("author") {
@@ -242,7 +242,7 @@ private static Command CreateSignCommand()
         {
             Arity = ArgumentArity.Zero
         });
-        signCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        signCommand.Options.Add(CommonOptions.CreateVerbosityOption(Utils.VerbosityOptions.normal));
 
         return signCommand;
     }

src/Cli/dotnet/Commands/Package/Add/PackageAddCommandDefinition.cs

@@ -54,7 +54,7 @@ public abstract class PackageAddCommandDefinitionBase : Command
         HelpName = CliCommandStrings.CmdPackageDirectory
     }.ForwardAsSingle(o => $"--package-directory {o}");
 
-    public static Option<bool> CreateInteractiveOption() => CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public static Option<bool> CreateInteractiveOption() => CommonOptions.CreateInteractiveOption().ForwardIfEnabled("--interactive");
 
     public readonly Argument<PackageIdentityWithRange> PackageIdArgument = CommonArguments.CreateRequiredPackageIdentityArgument();
     public readonly Option<string> VersionOption = CreateVersionOption();

src/Cli/dotnet/Commands/Package/List/PackageListCommandDefinition.cs

@@ -86,7 +86,7 @@ internal abstract class PackageListCommandDefinitionBase : Command
     }.ForwardAsManyArgumentsEachPrefixedByOption("--source")
     .AllowSingleArgPerToken();
 
-    public readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public readonly Option<bool> InteractiveOption = CommonOptions.CreateInteractiveOption().ForwardIfEnabled("--interactive");
 
     public readonly Option NoRestore = new Option<bool>("--no-restore")
     {

src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandDefinition.cs

@@ -26,7 +26,7 @@ internal abstract class PackageRemoveCommandDefinitionBase : Command
         Arity = ArgumentArity.OneOrMore,
     };
 
-    public readonly Option<bool> InteractiveOption = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public readonly Option<bool> InteractiveOption = CommonOptions.CreateInteractiveOption().ForwardIfEnabled("--interactive");
     public readonly Option<string?> ProjectOption = PackageCommandDefinition.CreateProjectOption();
     public readonly Option<string?> FileOption = PackageCommandDefinition.CreateFileOption();
 

src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandDefinition.cs

@@ -42,7 +42,7 @@ internal sealed class PackageSearchCommandDefinition : Command
         Arity = ArgumentArity.Zero
     }.ForwardAs("--exact-match");
 
-    public readonly Option<bool> Interactive = CommonOptions.InteractiveOption().ForwardIfEnabled("--interactive");
+    public readonly Option<bool> Interactive = CommonOptions.CreateInteractiveOption().ForwardIfEnabled("--interactive");
 
     public readonly Option<bool> Prerelease = new Option<bool>("--prerelease")
     {