refactor(cli): Delegate help and version handling to System.CommandLine

Author: arturcic

src/.run/cli (help - new).run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (help - new)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
-    <option name="PROGRAM_PARAMETERS" value="--help" />
+    <option name="PROGRAM_PARAMETERS" value="-h" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="ENV_FILE_PATHS" value="" />

src/.run/cli (new).run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (new)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
-    <option name="PROGRAM_PARAMETERS" value="--no-cache -l console" />
+    <option name="PROGRAM_PARAMETERS" value="--no-cache --log-file console" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="ENV_FILE_PATHS" value="" />

src/.run/cli (old).run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cli (old)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0/gitversion" />
-    <option name="PROGRAM_PARAMETERS" value="--no-cache --log-file console" />
+    <option name="PROGRAM_PARAMETERS" value="-nocache -l console" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/GitVersion.App/bin/Debug/net10.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
@@ -23,4 +23,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

src/GitVersion.App/ArgumentParser.cs

@@ -46,30 +46,7 @@ public Arguments ParseArguments(string commandLineArguments) =>
 
     public Arguments ParseArguments(string[] commandLineArguments)
     {
-        if (commandLineArguments.Length == 0)
-        {
-            var args = new Arguments { TargetPath = SysEnv.CurrentDirectory };
-            args.Output.Add(OutputType.Json);
-            AddAuthentication(args);
-            return args;
-        }
-
         var (rootCommand, options) = commandFactory.Value;
-
-        // Let System.CommandLine handle --help output natively
-        if (commandLineArguments.Any(a => a is "--help" or "-h"))
-        {
-            PrintBuiltInHelp(rootCommand);
-            return new Arguments { IsHelp = true };
-        }
-
-        // Handle --version before parsing to avoid System.CommandLine interception
-        if (commandLineArguments.Any(a => a is "--version"))
-        {
-            PrintBuiltInVersion();
-            return new Arguments { IsVersion = true };
-        }
-
         var parseResult = rootCommand.Parse(commandLineArguments);
 
         if (parseResult.Errors.Count > 0)
@@ -92,6 +69,17 @@ public Arguments ParseArguments(string[] commandLineArguments)
             throw new WarningException($"Could not parse command line parameter '{positionalCheck}'.");
         }
 
+        if (IsOptionExplicitlySet<HelpOption>())
+        {
+            parseResult.Invoke();
+            return new Arguments { IsHelp = true };
+        }
+        if (IsOptionExplicitlySet<VersionOption>())
+        {
+            parseResult.Invoke();
+            return new Arguments { IsVersion = true };
+        }
+
         var arguments = new Arguments();
         AddAuthentication(arguments);
         MapParsedValues(arguments, parseResult, options);
@@ -117,24 +105,11 @@ public Arguments ParseArguments(string[] commandLineArguments)
         ValidateConfigurationFile(arguments);
 
         return arguments;
-    }
-
-    private static void PrintBuiltInHelp(RootCommand rootCommand)
-    {
-        rootCommand.SetAction((_, _) => Task.FromResult(0));
-        rootCommand.Parse(["--help"]).Invoke();
-    }
 
-    private void PrintBuiltInVersion()
-    {
-        var assembly = Assembly.GetExecutingAssembly();
-        var version = assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
-            .FirstOrDefault() is AssemblyInformationalVersionAttribute attr
-            ? attr.InformationalVersion
-            : assembly.GetName().Version?.ToString();
-        if (version != null)
-        {
-            this.console.WriteLine(version);
+        bool IsOptionExplicitlySet<T>() where T : Option
+        {
+            var option = rootCommand.Options.SingleOfType<T>();
+            return parseResult.GetResult(option) is { Implicit: false };
         }
     }