Version 2.7.0

- Updated to version 2.0.0-beta7.25380.108 of System.CommandLine.

Author: calacayir

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#generateassemblyinfo -->
-    <VersionPrefix>2.6.8</VersionPrefix>
+    <VersionPrefix>2.7.0</VersionPrefix>
     <Product>DotMake Command-Line</Product>
     <Company>DotMake</Company>
     <!-- Copyright is also used for NuGet metadata -->

src/DotMake.CommandLine/CliContext.cs

@@ -30,8 +30,8 @@ public CliContext(CliBindingContext bindingContext, ParseResult parseResult, Can
             Result = new CliResult(bindingContext, parseResult);
             this.parseResult = parseResult;
 
-            Output = parseResult.Configuration.Output;
-            Error = parseResult.Configuration.Error;
+            Output = parseResult.InvocationConfiguration.Output;
+            Error = parseResult.InvocationConfiguration.Error;
             CancellationToken = cancellationToken;
         }
 
@@ -100,25 +100,23 @@ public void ShowHelp()
         /// </summary>
         public void ShowValues()
         {
-            var output = parseResult.Configuration.Output;
-
             var command = parseResult.CommandResult.Command;
             var isRoot = (command.Parents.FirstOrDefault() == null);
             var bindingContext = new CliBindingContext();
 
-            output.WriteLine($"Command = \"{command.Name}\" [{(isRoot ? "Root command" : "Sub-command")}]");
+            Output.WriteLine($"Command = \"{command.Name}\" [{(isRoot ? "Root command" : "Sub-command")}]");
 
             foreach (var symbolResult in parseResult.CommandResult.Children)
             {
                 if (symbolResult is ArgumentResult argumentResult)
                 {
                     var value = bindingContext.GetValue(parseResult, argumentResult.Argument);
-                    output.WriteLine($"Argument '{argumentResult.Argument.Name}' = {CliStringUtil.FormatValue(value)}");
+                    Output.WriteLine($"Argument '{argumentResult.Argument.Name}' = {CliStringUtil.FormatValue(value)}");
                 }
                 else if (symbolResult is OptionResult optionResult)
                 {
                     var value = bindingContext.GetValue(parseResult, optionResult.Option);
-                    output.WriteLine($"Option '{optionResult.Option.Name}' = {CliStringUtil.FormatValue(value)}");
+                    Output.WriteLine($"Option '{optionResult.Option.Name}' = {CliStringUtil.FormatValue(value)}");
                 }
             }
         }
@@ -130,7 +128,7 @@ public void ShowValues()
         public void ShowHierarchy(bool showLevel = false)
         {
             var theme = GetThemeOrDefault();
-            var rootCommand = parseResult.Configuration.RootCommand;
+            var rootCommand = parseResult.RootCommandResult.Command;
 
             foreach (var command in GetParentTree(rootCommand))
             {

src/DotMake.CommandLine/CliParser.cs

@@ -19,7 +19,8 @@ public class CliParser
     {
         private readonly CliBindingContext bindingContext = new();
         private readonly CliSettings settings;
-        private readonly CommandLineConfiguration configuration;
+        private readonly ParserConfiguration parserConfiguration;
+        private readonly InvocationConfiguration invocationConfiguration;
 
         internal CliParser(Type definitionType, CliSettings settings = null)
         {
@@ -31,17 +32,21 @@ internal CliParser(Type definitionType, CliSettings settings = null)
 
             Command = command;
 
-            configuration = new CommandLineConfiguration(command)
+            parserConfiguration = new ParserConfiguration
             {
                 EnablePosixBundling = settings.EnablePosixBundling,
+                ResponseFileTokenReplacer = settings.ResponseFileTokenReplacer
+            };
+
+            invocationConfiguration = new InvocationConfiguration
+            {
                 EnableDefaultExceptionHandler = settings.EnableDefaultExceptionHandler,
                 ProcessTerminationTimeout = settings.ProcessTerminationTimeout,
-                ResponseFileTokenReplacer = settings.ResponseFileTokenReplacer
             };
             if (settings.Output != null) //Console.Out is NOT being used
-                configuration.Output = settings.Output;
+                invocationConfiguration.Output = settings.Output;
             if (settings.Error != null) //Console.Error is NOT being used
-                configuration.Error = settings.Error;
+                invocationConfiguration.Error = settings.Error;
 
             if (rootCommand != null)
             {
@@ -121,7 +126,7 @@ internal CliParser(Type definitionType, CliSettings settings = null)
         */
         public CliResult Parse(string[] args = null)
         {
-            var parseResult = configuration.Parse(FixArgs(args) ?? GetArgs());
+            var parseResult = Command.Parse(FixArgs(args) ?? GetArgs(), parserConfiguration);
             return new CliResult(bindingContext, parseResult);
         }
 
@@ -137,7 +142,7 @@ public CliResult Parse(string[] args = null)
         */
         public CliResult Parse(string commandLine)
         {
-            var parseResult = configuration.Parse(commandLine);
+            var parseResult = Command.Parse(commandLine, parserConfiguration);
             return new CliResult(bindingContext, parseResult);
         }
 
@@ -156,7 +161,8 @@ public CliResult Parse(string commandLine)
         public int Run(string[] args = null)
         {
             using (new CliSession(settings))
-                return configuration.Invoke(FixArgs(args) ?? GetArgs());
+                return Command.Parse(FixArgs(args) ?? GetArgs(), parserConfiguration)
+                    .Invoke(invocationConfiguration);
         }
 
         /// <summary>
@@ -173,7 +179,8 @@ public int Run(string[] args = null)
         public int Run(string commandLine)
         {
             using (new CliSession(settings))
-                return configuration.Invoke(commandLine);
+                return Command.Parse(commandLine, parserConfiguration)
+                    .Invoke(invocationConfiguration);
         }
 
         /// <summary>
@@ -191,7 +198,8 @@ public int Run(string commandLine)
         public async Task<int> RunAsync(string[] args = null, CancellationToken cancellationToken = default)
         {
             using (new CliSession(settings))
-                return await configuration.InvokeAsync(FixArgs(args) ?? GetArgs(), cancellationToken);
+                return await Command.Parse(FixArgs(args) ?? GetArgs(), parserConfiguration)
+                    .InvokeAsync(invocationConfiguration, cancellationToken);
         }
 
         /// <summary>
@@ -209,7 +217,8 @@ public async Task<int> RunAsync(string[] args = null, CancellationToken cancella
         public async Task<int> RunAsync(string commandLine, CancellationToken cancellationToken = default)
         {
             using (new CliSession(settings))
-                return await configuration.InvokeAsync(commandLine, cancellationToken);
+                return await Command.Parse(commandLine, parserConfiguration)
+                    .InvokeAsync(invocationConfiguration, cancellationToken);
         }
 
 
@@ -267,7 +276,7 @@ private sealed class VersionOptionAction : SynchronousCommandLineAction
         {
             public override int Invoke(ParseResult parseResult)
             {
-                parseResult.Configuration.Output.WriteLine(ExecutableInfo.Version);
+                parseResult.InvocationConfiguration.Output.WriteLine(ExecutableInfo.Version);
                 return 0;
             }
         }

src/DotMake.CommandLine/CliSettings.cs

@@ -16,15 +16,15 @@ public class CliSettings
         /// </summary>
         /// <param name="value"><see langword="true" /> to parse POSIX bundles; otherwise, <see langword="false" />.</param>
         /// <remarks>
-        /// POSIX conventions recommend that single-character options be allowed to be specified together after a single <c>-</c> prefix. When <see cref="P:System.CommandLine.CliConfiguration.EnablePosixBundling" /> is set to <see langword="true" />, the following command lines are equivalent:
+        /// POSIX conventions recommend that single-character options be allowed to be specified together after a single <c>-</c> prefix. When <see cref="EnablePosixBundling" /> is set to <see langword="true" />, the following command lines are equivalent:
         ///
         /// <code>
         /// &gt; myapp -a -b -c
         /// &gt; myapp -abc
         /// </code>
         ///
         /// If an argument is provided after an option bundle, it applies to the last option in the bundle.
-        /// When <see cref="P:System.CommandLine.CliConfiguration.EnablePosixBundling" /> is set to <see langword="true" />,
+        /// When <see cref="EnablePosixBundling" /> is set to <see langword="true" />,
         /// all of the following command lines are equivalent:
         /// <code>
         /// &gt; myapp -a -b -c arg
@@ -65,7 +65,7 @@ public class CliSettings
 
         /// <summary>
         /// Enables signaling and handling of process termination (Ctrl+C, SIGINT, SIGTERM) via a <see cref="T:System.Threading.CancellationToken" /> 
-        /// that can be passed to a <see cref="T:System.CommandLine.Invocation.CliAction" /> during invocation.
+        /// that can be passed to a <see cref="T:System.CommandLine.Invocation.CommandLineAction" /> during invocation.
         /// If not provided, a default timeout of 2 seconds is enforced.
         /// </summary>
         public TimeSpan? ProcessTerminationTimeout { get; set; } = TimeSpan.FromSeconds(2.0);
@@ -78,7 +78,7 @@ public class CliSettings
         /// When enabled, any token prefixed with <c>@</c> can be replaced with zero or more other tokens.
         /// This is mostly commonly used to expand tokens from response files and interpolate them into a command line prior to parsing.
         /// </remarks>
-        public TryReplaceToken ResponseFileTokenReplacer { get; set; } = DefaultConfiguration.ResponseFileTokenReplacer;
+        public TryReplaceToken ResponseFileTokenReplacer { get; set; } = DefaultParserConfiguration.ResponseFileTokenReplacer;
 
         /// <summary>
         /// Gets or sets the standard output. Used by Help and other facilities that write non-error information.
@@ -102,6 +102,6 @@ public class CliSettings
         /// </summary>
         public CliTheme Theme { get; set; } = CliTheme.Default;
 
-        private static readonly CommandLineConfiguration DefaultConfiguration = new CommandLineConfiguration(new RootCommand());
+        private static readonly ParserConfiguration DefaultParserConfiguration = new ();
     }
 }

src/DotMake.CommandLine/DotMake.CommandLine.csproj

@@ -21,22 +21,7 @@
     <PackageTags>command-line CLI console System.CommandLine declarative attributes parsing command argument option generator</PackageTags>
     <PackageReleaseNotes>
       <![CDATA[
-        - Added: `Command` and `RootCommand` properties to `CliParser` class:
-          ```c#
-          var parser = Cli.GetParser<RootCliCommand>();
-
-          //Access the command that is used to parse the command line input.
-          var command = parser.Command;
-
-          //Access the root of the command that is used to parse the command line input.
-          //If parser.Command is already a root command, this will be same instance.
-          //If it's a sub-command, it will be the root of that sub-command.
-          var rootCommand = parser.RootCommand;
-          ```
-          
-        - Fixed: SourceGenerator sometimes triggers a concurrency exception. Use `ConcurrentDictionary` for `GenerationCounts`.
-
-        - Fixed: Do not add auto name or alias for root commands as it can unnecessarily conflict with children.
+        - Updated to version 2.0.0-beta7.25380.108 of System.CommandLine.
       ]]>
      </PackageReleaseNotes>
   </PropertyGroup>
@@ -45,7 +30,7 @@
 
   <ItemGroup>
     <!-- use exact version match with [] for now as future beta versions can break API -->
-    <PackageReference Include="System.CommandLine" Version="[2.0.0-beta6.25358.103]" />
+    <PackageReference Include="System.CommandLine" Version="[2.0.0-beta7.25380.108]" />
 
     <!--
       UPDATE: No longer using this as now 2.0.0-beta5.25306.1 is released to official nuget feed.

src/DotMake.CommandLine/Help/CustomHelpAction.cs

@@ -25,7 +25,7 @@ public HelpBuilder Builder
         /// <inheritdoc />
         public override int Invoke(ParseResult parseResult)
         {
-            var output = parseResult.Configuration.Output;
+            var output = parseResult.InvocationConfiguration.Output;
 
             var helpContext = new HelpContext(Builder,
                 parseResult.CommandResult.Command,

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(ModuleInitializerAttribute).g.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.6.8.0
+// Generated by DotMake.CommandLine.SourceGeneration v2.7.0.0
 // Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
 // Generation: 1
 

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/(RequiredMemberAttribute).g.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.6.8.0
+// Generated by DotMake.CommandLine.SourceGeneration v2.7.0.0
 // Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
 // Generation: 1
 

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/ArgumentConverterCliCommandBuilder-3j0trcm.g.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.6.8.0
+// Generated by DotMake.CommandLine.SourceGeneration v2.7.0.0
 // Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
 // Generation: 1
 

src/TestApp/GeneratedFiles/net472/DotMake.CommandLine.SourceGeneration/DotMake.CommandLine.SourceGeneration.CliIncrementalGenerator/CamelCaseCliCommandBuilder-2ntm48g.g.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-// Generated by DotMake.CommandLine.SourceGeneration v2.6.8.0
+// Generated by DotMake.CommandLine.SourceGeneration v2.7.0.0
 // Roslyn (Microsoft.CodeAnalysis) v4.1400.25.35903
 // Generation: 1