remove abbreviations from verbosity enum definition and update callsites

Author: baronfel

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

@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Utils;
 /// </summary>
 public sealed class MSBuildArgs
 {
-    private MSBuildArgs(ReadOnlyDictionary<string, string>? properties, ReadOnlyDictionary<string, string>? restoreProperties, string[]? targets, VerbosityOptions? verbosity, string[]? otherMSBuildArgs)
+    private MSBuildArgs(ReadOnlyDictionary<string, string>? properties, ReadOnlyDictionary<string, string>? restoreProperties, string[]? targets, Verbosity? verbosity, string[]? otherMSBuildArgs)
     {
         GlobalProperties = properties;
         RestoreGlobalProperties = restoreProperties;
@@ -37,7 +37,7 @@ private MSBuildArgs(ReadOnlyDictionary<string, string>? properties, ReadOnlyDict
     /// The ordered list of targets that should be passed to MSBuild.
     /// </summary>
     public string[]? RequestedTargets { get; }
-    public VerbosityOptions? Verbosity { get; }
+    public Verbosity? Verbosity { get; }
 
     /// <summary>
     /// All other arguments that aren't already explicitly modeled by this structure.
@@ -71,7 +71,7 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
         var restoreProperties = parseResult.GetResult("--restoreProperty") is OptionResult restoreResult ? restoreResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
         var requestedTargets = parseResult.GetResult("--target") is OptionResult targetResult ? targetResult.GetValueOrDefault<string[]?>() : null;
         var verbosity = parseResult.GetResult("--verbosity") is OptionResult verbosityResult
-            ? verbosityResult.GetValueOrDefault<VerbosityOptions?>()
+            ? verbosityResult.GetValueOrDefault<Verbosity?>()
             : null;
         var otherMSBuildArgs = parseResult.UnmatchedTokens.ToArray();
         return new MSBuildArgs(
@@ -92,7 +92,7 @@ public static MSBuildArgs FromOtherArgs(params ReadOnlySpan<string> args)
     {
         return new MSBuildArgs(null, null, null, null, args.ToArray());
     }
-    public static MSBuildArgs FromVerbosity(VerbosityOptions verbosity)
+    public static MSBuildArgs FromVerbosity(Verbosity verbosity)
     {
         return new MSBuildArgs(null, null, null, verbosity, null);
     }
@@ -174,7 +174,7 @@ public MSBuildArgs CloneWithAdditionalTargets(params ReadOnlySpan<string> additi
         return new MSBuildArgs(GlobalProperties, RestoreGlobalProperties, newTargets, Verbosity, OtherMSBuildArgs.ToArray());
     }
 
-    public MSBuildArgs CloneWithVerbosity(VerbosityOptions newVerbosity)
+    public MSBuildArgs CloneWithVerbosity(Verbosity newVerbosity)
     {
         return new MSBuildArgs(GlobalProperties, RestoreGlobalProperties, RequestedTargets, newVerbosity, OtherMSBuildArgs.ToArray());
     }

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

@@ -6,16 +6,11 @@ namespace Microsoft.DotNet.Cli.Utils;
 /// 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

@@ -58,7 +58,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

@@ -35,7 +35,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

@@ -30,7 +30,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")
     {
@@ -47,7 +47,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,
@@ -81,22 +81,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

@@ -152,7 +152,7 @@ private static Command GetVerifyCommand()
         verifyCommand.Options.Add(new ForwardedOption<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);
 
@@ -183,13 +183,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);
         }
 
@@ -260,7 +260,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

@@ -73,14 +73,14 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
             msbuildPath);
     }
 
-    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
         };
     }
@@ -91,14 +91,14 @@ public static int RunPackCommand(ParseResult parseResult)
 
         if (args.Count != 1)
         {
-            Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed); 
+            Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed);
             return 1;
         }
 
         var nuspecPath = args[0];
 
         var packArgs = new PackArgs()
-        { 
+        {
             Logger = new NuGetConsoleLogger(),
             Exclude = new List<string>(),
             OutputDirectory = parseResult.GetValue(PackCommandParser.OutputOption),

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 ForwardedOption<NuGetVersion>("--version")