remove abbreviations from verbosity enum definition and update callsites

Author: baronfel

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs

@@ -20,7 +20,7 @@ private MSBuildArgs(
         string[]? getItem,
         string[]? getTargetResult,
         string[]? getResultOutputFile,
-        VerbosityOptions? verbosity,
+        Verbosity? verbosity,
         string[]? otherMSBuildArgs)
     {
         GlobalProperties = properties;
@@ -59,7 +59,7 @@ private MSBuildArgs(
 
     public string[]? GetResultOutputFile { get; }
 
-    public VerbosityOptions? Verbosity { get; }
+    public Verbosity? Verbosity { get; }
 
     /// <summary>
     /// All other arguments that aren't already explicitly modeled by this structure.
@@ -97,7 +97,7 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
         var getTargetResult = TryGetValue<string[]?>("--getTargetResult");
         var getResultOutputFile = TryGetValue<string[]?>("--getResultOutputFile");
         var verbosity = parseResult.GetResult("--verbosity") is OptionResult verbosityResult
-            ? verbosityResult.GetValueOrDefault<VerbosityOptions?>()
+            ? verbosityResult.GetValueOrDefault<Verbosity?>()
             : null;
         var otherMSBuildArgs = parseResult.UnmatchedTokens.ToArray();
         return new MSBuildArgs(
@@ -127,7 +127,7 @@ public static MSBuildArgs FromOtherArgs(params ReadOnlySpan<string> args)
     {
         return new MSBuildArgs(null, null, null, null, null, null, null, null, args.ToArray());
     }
-    public static MSBuildArgs FromVerbosity(VerbosityOptions verbosity)
+    public static MSBuildArgs FromVerbosity(Verbosity verbosity)
     {
         return new MSBuildArgs(null, null, null, null, null, null, null, verbosity, null);
     }
@@ -294,7 +294,7 @@ public MSBuildArgs CloneWithAdditionalTargets(params ReadOnlySpan<string> additi
             OtherMSBuildArgs.ToArray());
     }
 
-    public MSBuildArgs CloneWithVerbosity(VerbosityOptions newVerbosity)
+    public MSBuildArgs CloneWithVerbosity(Verbosity newVerbosity)
     {
         return new MSBuildArgs(
             GlobalProperties,

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs

@@ -22,7 +22,7 @@ public static string MSBuildVersion
 
     private const string SdksDirectoryName = "Sdks";
 
-    internal const VerbosityOptions DefaultVerbosity = VerbosityOptions.m;
+    internal const Verbosity DefaultVerbosity = Verbosity.minimal;
 
     // Null if we're running MSBuild in-proc.
     private ForwardingAppImplementation? _forwardingApp;

src/Cli/Microsoft.DotNet.Cli.Utils/VerbosityOptions.cs renamed to src/Cli/Microsoft.DotNet.Cli.Utils/Verbosity.cs

@@ -3,19 +3,12 @@ namespace Microsoft.DotNet.Cli.Utils;
 /// <summary>
 /// Represents the desired verbosity level for command output.
 /// Maps mostly to MSBuild's verbosity levels.
-/// The odd naming is because we're currently leaning entirely on System.CommandLine's
-/// default enum parsing.
 /// </summary>
-public enum VerbosityOptions
+public enum Verbosity
 {
     quiet,
-    q,
     minimal,
-    m,
     normal,
-    n,
     detailed,
-    d,
-    diagnostic,
-    diag
+    diagnostic
 }

src/Cli/dotnet/CliSchema.cs

@@ -187,11 +187,11 @@ private static RootCommandDetails CreateRootCommandDetails(Command command)
 
     /// <summary>
     /// Maps some types that don't serialize well to more human-readable strings.
-    /// For example, <see cref="VerbosityOptions"/> is serialized as a string instead of an integer.
+    /// For example, <see cref="Verbosity"/> is serialized as a string instead of an integer.
     /// </summary>
     private static object? HumanizeValue(object? v) => v switch
     {
-        VerbosityOptions o => Enum.GetName(o),
+        Verbosity o => Enum.GetName(o),
         null => null,
         _ => v // For other types, return as is
     };

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

@@ -59,7 +59,7 @@ internal static class BuildCommandParser
     /// </summary>
     public static readonly Option<string[]?> TargetOption = CommonOptions.MSBuildTargetOption();
 
-    public static readonly Option<Utils.VerbosityOptions?> VerbosityOption = CommonOptions.VerbosityOption();
+    public static readonly Option<Utils.Verbosity?> VerbosityOption = CommonOptions.VerbosityOption();
 
     private static readonly Command Command = ConstructCommand();
 

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

@@ -36,7 +36,7 @@ internal static class CleanCommandParser
 
     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.Verbosity> VerbosityOption = CommonOptions.VerbosityOption(Utils.Verbosity.normal);
 
 
     private static readonly Command Command = ConstructCommand();

src/Cli/dotnet/Commands/New/NewCommandParser.cs

@@ -31,7 +31,7 @@ internal static class NewCommandParser
 
     private const string HostIdentifier = "dotnetcli";
 
-    private const VerbosityOptions DefaultVerbosity = VerbosityOptions.normal;
+    private const Verbosity DefaultVerbosity = Verbosity.normal;
 
     private static readonly Option<bool> s_disableSdkTemplatesOption = new Option<bool>("--debug:disable-sdk-templates")
     {
@@ -48,7 +48,7 @@ internal static class NewCommandParser
         Recursive = true
     }.Hide();
 
-    private static readonly Option<VerbosityOptions> s_verbosityOption = new("--verbosity", "-v")
+    private static readonly Option<Verbosity> s_verbosityOption = new("--verbosity", "-v")
     {
         DefaultValueFactory = _ => DefaultVerbosity,
         Description = CliCommandStrings.Verbosity_OptionDescription,
@@ -82,22 +82,22 @@ static CliTemplateEngineHost GetEngineHost(ParseResult parseResult)
             FileInfo? outputPath = parseResult.GetValue(SharedOptions.OutputOption);
 
             OptionResult? verbosityOptionResult = parseResult.GetResult(s_verbosityOption);
-            VerbosityOptions verbosity = DefaultVerbosity;
+            Verbosity verbosity = DefaultVerbosity;
 
             if (diagnosticMode || CommandLoggingContext.IsVerbose)
             {
                 CommandLoggingContext.SetError(true);
                 CommandLoggingContext.SetOutput(true);
                 CommandLoggingContext.SetVerbose(true);
-                verbosity = VerbosityOptions.diagnostic;
+                verbosity = Verbosity.diagnostic;
             }
             else if (verbosityOptionResult != null
                 && !verbosityOptionResult.Implicit
                 // if verbosityOptionResult contains an error, ArgumentConverter.GetValueOrDefault throws an exception
                 // and callstack is pushed to process output
                 && !parseResult.Errors.Any(error => error.SymbolResult == verbosityOptionResult))
             {
-                VerbosityOptions userSetVerbosity = verbosityOptionResult.GetValueOrDefault<VerbosityOptions>();
+                Verbosity userSetVerbosity = verbosityOptionResult.GetValueOrDefault<Verbosity>();
                 if (userSetVerbosity.IsQuiet())
                 {
                     CommandLoggingContext.SetError(false);

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

@@ -153,7 +153,7 @@ private static Command GetVerifyCommand()
         verifyCommand.Options.Add(new Option<IEnumerable<string>>(fingerprint)
             .ForwardAsManyArgumentsEachPrefixedByOption(fingerprint)
             .AllowSingleArgPerToken());
-        verifyCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        verifyCommand.Options.Add(CommonOptions.VerbosityOption(Utils.Verbosity.normal));
 
         verifyCommand.SetAction(NuGetCommand.Run);
 
@@ -184,13 +184,13 @@ private static Command GetTrustCommand()
         // as well as the standard NugetCommand.Run handler
 
         trustCommand.Options.Add(configFile);
-        trustCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        trustCommand.Options.Add(CommonOptions.VerbosityOption(Utils.Verbosity.normal));
         trustCommand.SetAction(NuGetCommand.Run);
 
         foreach (var command in trustCommand.Subcommands)
         {
             command.Options.Add(configFile);
-            command.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+            command.Options.Add(CommonOptions.VerbosityOption(Utils.Verbosity.normal));
             command.SetAction(NuGetCommand.Run);
         }
 
@@ -261,7 +261,7 @@ private static Command GetSignCommand()
         {
             Arity = ArgumentArity.Zero
         });
-        signCommand.Options.Add(CommonOptions.VerbosityOption(Utils.VerbosityOptions.normal));
+        signCommand.Options.Add(CommonOptions.VerbosityOption(Utils.Verbosity.normal));
 
         signCommand.SetAction(NuGetCommand.Run);
 

src/Cli/dotnet/Commands/Pack/PackCommand.cs

@@ -75,14 +75,14 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
             });
     }
 
-    private static LogLevel MappingVerbosityToNugetLogLevel(VerbosityOptions? verbosity)
+    private static LogLevel MappingVerbosityToNugetLogLevel(Verbosity? verbosity)
     {
         return verbosity switch
         {
-            VerbosityOptions.diagnostic or VerbosityOptions.diag => LogLevel.Debug,
-            VerbosityOptions.minimal or VerbosityOptions.m => LogLevel.Minimal,
-            VerbosityOptions.normal or VerbosityOptions.n => LogLevel.Information,
-            VerbosityOptions.detailed or VerbosityOptions.d => LogLevel.Verbose,
+            Verbosity.diagnostic => LogLevel.Debug,
+            Verbosity.minimal => LogLevel.Minimal,
+            Verbosity.normal => LogLevel.Information,
+            Verbosity.detailed => LogLevel.Verbose,
             _ => LogLevel.Minimal
         };
     }

src/Cli/dotnet/Commands/Pack/PackCommandParser.cs

@@ -60,7 +60,7 @@ internal static class PackCommandParser
     public static readonly Option<string?> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.PackConfigurationOptionDescription);
 
     public static readonly Option<string[]> TargetOption = CommonOptions.RequiredMSBuildTargetOption("Pack", [("_IsPacking", "true")]);
-    public static readonly Option<Utils.VerbosityOptions?> VerbosityOption = BuildCommandParser.VerbosityOption;
+    public static readonly Option<Utils.Verbosity?> VerbosityOption = BuildCommandParser.VerbosityOption;
 
     public static Option<NuGetVersion> VersionOption =
         new Option<NuGetVersion>("--version")