dotnet · Aug 17, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Nov 16, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,21 +1,8 @@
 <Project>
-
-  <Import Project="Sdk.props"
-          Sdk="Microsoft.DotNet.Arcade.Sdk"
-          Condition="'$(DisableArcade)' != '1'" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('$(MSBuildThisFile)', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn);NU5125;CS0618</NoWarn>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <LangVersion>10.0</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
-    <TargetFrameworkForNETSDK>$(NetCurrent)</TargetFrameworkForNETSDK>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
-    <TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
+    <TargetFrameworkForNETSDK>$(CoreTargetFramework)</TargetFrameworkForNETSDK>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/NuGet.config → _NuGet.config b/NuGet.config → _NuGet.config
diff --git a/global.json → _global.json b/global.json → _global.json
diff --git a/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj b/src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <IsPackable>true</IsPackable>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;$(TargetFrameworkForNETSDK)</TargetFrameworks>
     <Description>This package provides support for using System.CommandLine with Microsoft.Extensions.Hosting.</Description>
   </PropertyGroup>
 

diff --git a/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs b/src/System.CommandLine.NamingConventionBinder/BindingContextExtensions.cs
@@ -17,6 +17,11 @@ private sealed class DummyStateHoldingHandler : BindingHandler
         public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default) => Task.FromResult(0);
     }
 
+    /// <summary>
+    /// <inheritdoc cref="BindingHandler.GetBindingContext(ParseResult)"/>
+    /// </summary>
+    /// <param name="parseResult"></param>
+    /// <returns></returns>
     public static BindingContext GetBindingContext(this ParseResult parseResult)
     {
         // parsing resulted with no handler or it was not created yet, we fake it to just store the BindingContext between the calls

diff --git a/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs b/src/System.CommandLine.NamingConventionBinder/BindingHandler.cs
@@ -6,6 +6,9 @@
 
 namespace System.CommandLine.NamingConventionBinder
 {
+    /// <summary>
+    /// <inheritdoc cref="AsynchronousCliAction"/>
+    /// </summary>
     public abstract class BindingHandler : AsynchronousCliAction
     {
         private BindingContext? _bindingContext;

diff --git a/...ystem.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj b/...ystem.CommandLine.NamingConventionBinder/System.CommandLine.NamingConventionBinder.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>System.CommandLine.NamingConventionBinder</PackageId>
-    <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
-    <LangVersion>10</LangVersion>
     <Nullable>enable</Nullable>
     <Description>This package provides command handler support for System.CommandLine performs parameter and model binding by matching option and argument names to parameter and property names.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/System.CommandLine/CliCommand.cs b/src/System.CommandLine/CliCommand.cs
@@ -181,12 +181,27 @@ public void SetAction(Func<ParseResult, CancellationToken, Task<int>> action)
         /// <param name="command">The Command to add to the command.</param>
         public void Add(CliCommand command) =>  Subcommands.Add(command);
 
+        /// <summary>
+        /// Enable double dash (--) greedy parsing mode (consider all tokens after a double dash as unmatched).<br/>
+        /// Unmatched tokens are available after parsing in <see cref="ParseResult.UnmatchedTokens"/>.
+        /// </summary>
+        public void EnableDoubleDashGreedyMode()
+        {
+            TreatDoubleDashTokensAsUnmatched = true;
+            TreatUnmatchedTokensAsErrors = false;
+        }
+
         /// <summary>
         /// Gets or sets a value that indicates whether unmatched tokens should be treated as errors. For example,
         /// if set to <see langword="true"/> and an extra command or argument is provided, validation will fail.
         /// </summary>
         public bool TreatUnmatchedTokensAsErrors { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets a value that indicates whether tokens after a double dash should be considered as unmatched.
+        /// </summary>
+        internal bool TreatDoubleDashTokensAsUnmatched { get; set; } = false;
+
         /// <inheritdoc />
         [DebuggerStepThrough]
         [EditorBrowsable(EditorBrowsableState.Never)] // hide from intellisense, it's public for C# collection initializer 
@@ -309,5 +324,11 @@ void AddCompletionsFor(CliSymbol identifier, AliasSet? aliases)
 
         internal bool EqualsNameOrAlias(string name)
             => Name.Equals(name, StringComparison.Ordinal) || (_aliases is not null && _aliases.Contains(name));
+
+        /// <summary>
+        /// Allows the caller to configure this command before starting parsing.
+        /// </summary>
+        /// <param name="commandResult">The parsing status prior to starting.</param>
+        protected internal virtual void OnParsing(CommandResult commandResult) { }
     }
 }
diff --git a/src/System.CommandLine/Parsing/ParseOperation.cs b/src/System.CommandLine/Parsing/ParseOperation.cs
@@ -19,6 +19,7 @@ internal sealed class ParseOperation
         private CommandResult _innermostCommandResult;
         private bool _isHelpRequested;
         private bool _isTerminatingDirectiveSpecified;
+        private bool _isDoubleDashSpecified;
         private CliAction? _primaryAction;
         private List<CliAction>? _preActions;
 
@@ -49,11 +50,22 @@ private bool More(out CliTokenType currentTokenType)
         {
             bool result = _index < _tokens.Count;
             currentTokenType = result ? _tokens[_index].Type : (CliTokenType)(-1);
+            if (currentTokenType is CliTokenType.DoubleDash)
+            {
+                _isDoubleDashSpecified = true;
+            }
             return result;
         }
 
+        private void OnCommandParsing()
+        {
+            _innermostCommandResult.Command.OnParsing(_innermostCommandResult);
+        }
+
         internal ParseResult Parse()
         {
+            OnCommandParsing();
+
             ParseDirectives();
 
             ParseCommandChildren();
@@ -95,6 +107,8 @@ private void ParseSubcommand()
 
             _symbolResultTree.Add(command, _innermostCommandResult);
 
+            OnCommandParsing();
+
             Advance();
 
             ParseCommandChildren();
@@ -107,7 +121,12 @@ private void ParseCommandChildren()
 
             while (More(out CliTokenType currentTokenType))
             {
-                if (currentTokenType == CliTokenType.Command)
+                if (_isDoubleDashSpecified && _innermostCommandResult.Command.TreatDoubleDashTokensAsUnmatched)
+                {
+                    AddCurrentTokenToUnmatched();
+                    Advance();
+                }
+                else if (currentTokenType == CliTokenType.Command)
                 {
                     ParseSubcommand();
                 }

diff --git a/src/System.CommandLine/System.CommandLine.csproj b/src/System.CommandLine/System.CommandLine.csproj
@@ -3,10 +3,8 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>System.CommandLine</PackageId>
-    <TargetFrameworks>$(TargetFrameworkForNETSDK);netstandard2.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>latest</LangVersion>
     <Description>Support for parsing command lines, supporting both POSIX and Windows conventions and shell-agnostic command line completions.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>