unify some diagnosticsoptions stuff

Author: baronfel

src/Cli/dotnet/CommonOptionsFactory.cs

@@ -3,8 +3,6 @@
 
 using System.CommandLine;
 using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
-using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli;
@@ -21,27 +19,21 @@ internal static class CommonOptionsFactory
     {
         Description = CliStrings.SDKDiagnosticsCommandDefinition,
         Recursive = recursive,
-        Arity = ArgumentArity.Zero
+        Arity = ArgumentArity.Zero,
+        Action = new SetDiagnosticModeAction()
     };
 
-    internal class SetDiagnosticModeAction(Option<bool> diagnosticOption) : SynchronousCommandLineAction
+    /// <summary>
+    /// Sets a few verbose diagnostics flags across the CLI.
+    /// Other commands may also use this to set their verbosity flags to a higher value or similar behaviors.
+    /// </summary>
+    internal class SetDiagnosticModeAction() : SynchronousCommandLineAction
     {
         public override int Invoke(ParseResult parseResult)
         {
-            if (parseResult.IsDotnetBuiltInCommand())
-            {
-                var diagIsChildOfRoot = parseResult.RootCommandResult.Children.FirstOrDefault((s) => s is OptionResult opt && opt.Option == diagnosticOption) is not null;
-
-                // We found --diagnostic or -d, but we still need to determine whether the option should
-                // be attached to the dotnet command or the subcommand.
-                if (diagIsChildOfRoot)
-                {
-                    Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString);
-                    CommandLoggingContext.SetVerbose(true);
-                    Reporter.Reset();
-                }
-            }
-
+            Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString);
+            CommandLoggingContext.SetVerbose(true);
+            Reporter.Reset();
             return 0;
         }
     }

src/Cli/dotnet/Parser.cs

@@ -197,18 +197,9 @@ private static RootCommand ConfigureCommandLine(RootCommand rootCommand)
 
         rootCommand.SetAction(parseResult =>
         {
-            if (parseResult.GetValue(DiagOption) && parseResult.Tokens.Count == 1)
-            {
-                // when user does not specify any args except of diagnostics ("dotnet -d"), we do nothing
-                // as Program.ProcessArgs already enabled the diagnostic output
-                return 0;
-            }
-            else
-            {
-                // when user does not specify any args (just "dotnet"), a usage needs to be printed
-                parseResult.InvocationConfiguration.Output.WriteLine(CliUsage.HelpText);
-                return 0;
-            }
+            // when user does not specify any args (just "dotnet"), a usage needs to be printed
+            parseResult.InvocationConfiguration.Output.WriteLine(CliUsage.HelpText);
+            return 0;
         });
 
         return rootCommand;