From 4a663430f87e1aa40589f4befcf3c42b8b02b7e3 Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Wed, 28 May 2025 13:41:16 +0200
Subject: [PATCH 1/3] stop using System.CommandLine types that won't be public
 anymore

---
 .../CommandService.cs                         | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
index 89b9a609bd..b04c4e0c1e 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
@@ -199,7 +199,7 @@ public string GetDetailedHelp(string commandName, IServiceProvider services, int
                         {
                             if (handler.IsCommandSupported(group.Parser, services))
                             {
-                                return group.GetDetailedHelp(command, services, consoleWidth);
+                                return group.GetDetailedHelp(command, services);
                             }
                             if (handler.FilterInvokeMessage != null)
                             {
@@ -276,7 +276,6 @@ private sealed class CommandGroup
         {
             private Command _rootCommand;
             private readonly Dictionary<string, CommandHandler> _commandHandlers = new();
-            private readonly ParseResult _emptyParseResult;
 
             /// <summary>
             /// Create an instance of the command processor;
@@ -285,10 +284,6 @@ private sealed class CommandGroup
             public CommandGroup(string commandPrompt = null)
             {
                 _rootCommand = new Command(commandPrompt);
-
-                // The actual ParseResult.Empty() has a bug in it where it tries to get the executable name
-                // and nothing is returned under lldb on Linux causing an index out of range exception.
-                _emptyParseResult = _rootCommand.Parse(Array.Empty<string>());
             }
 
             /// <summary>
@@ -317,7 +312,7 @@ internal bool Execute(IReadOnlyList<string> commandLine, IServiceProvider servic
                     {
                         sb.AppendLine(error.Message);
                     }
-                    string helpText = GetDetailedHelp(parseResult.CommandResult.Command, services, int.MaxValue);
+                    string helpText = GetDetailedHelp(parseResult.CommandResult.Command, services);
                     throw new CommandParsingException(sb.ToString(), helpText);
                 }
                 else
@@ -433,14 +428,17 @@ internal void CreateCommand(Type type, CommandAttribute commandAttribute, Func<I
                 // Build or re-build parser instance after this command is added
             }
 
-            internal string GetDetailedHelp(Command command, IServiceProvider services, int windowWidth)
+            internal string GetDetailedHelp(Command command, IServiceProvider services)
             {
                 StringWriter console = new();
+                CommandLineConfiguration configuration = new(command)
+                {
+                    Output = console
+                };
 
-                // Get the command help
-                HelpBuilder helpBuilder = new(maxWidth: windowWidth);
-                HelpContext helpContext = new(helpBuilder, command, console, _emptyParseResult);
-                helpBuilder.Write(helpContext);
+                // Get the command help by parsing the --help option
+                // and invoking the help action that writes to configuration.Output.
+                command.Parse(["--help"], configuration).Invoke();
 
                 // Get the detailed help if any
                 if (TryGetCommandHandler(command.Name, out CommandHandler handler))

From d7b7bd890b0c1870b8773f0bd3d6149a84363c76 Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Wed, 28 May 2025 15:06:24 +0200
Subject: [PATCH 2/3] fix some of the failing tests

---
 .../CommandService.cs                                      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
index b04c4e0c1e..5b953a1c73 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
@@ -436,9 +436,12 @@ internal string GetDetailedHelp(Command command, IServiceProvider services)
                     Output = console
                 };
 
-                // Get the command help by parsing the --help option
-                // and invoking the help action that writes to configuration.Output.
+                // Get the command help by parsing the --help option.
+                // The option is hidden so it doesn't show up in the help text.
+                command.Options.Add(new HelpOption() { Hidden = true });
+                // Invoking the help action writes to configuration.Output.
                 command.Parse(["--help"], configuration).Invoke();
+                command.Options.RemoveAt(command.Options.Count - 1); // Remove the help option
 
                 // Get the detailed help if any
                 if (TryGetCommandHandler(command.Name, out CommandHandler handler))

From dcfbc418b35ed817a7376d8a3f9e5f4b7db54722 Mon Sep 17 00:00:00 2001
From: Juan Sebastian Hoyos Ayala <juan.s.hoyos@outlook.com>
Date: Mon, 21 Jul 2025 18:12:51 -0700
Subject: [PATCH 3/3] Merge more changes from system.commandline

---
 eng/Version.Details.xml                       |  4 +++
 eng/Versions.props                            |  2 +-
 .../CommandService.cs                         | 32 +++++++------------
 src/Tools/Common/Commands/ProcessStatus.cs    |  2 +-
 src/Tools/Common/ProcessTerminationHandler.cs | 17 +++++-----
 src/Tools/dotnet-counters/Program.cs          |  4 +--
 src/Tools/dotnet-dump/Program.cs              |  6 ++--
 src/Tools/dotnet-sos/Program.cs               |  8 ++---
 src/Tools/dotnet-stack/ReportCommand.cs       |  4 +--
 src/Tools/dotnet-stack/Symbolicate.cs         |  4 +--
 .../CommandLine/Commands/ConvertCommand.cs    |  4 +--
 11 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 260c35a22a..37aac9a99f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,6 +9,10 @@
       <Uri>https://github.com/microsoft/clrmd</Uri>
       <Sha>d724947392626b66e39b525998a8817447d50380</Sha>
     </Dependency>
+    <Dependency Name="System.Commandline" Version="2.0.0-beta7.25365.101">
+      <Uri>https://github.com/dotnet/dotnet</Uri>
+      <Sha>78061f4bcc414fa2054be6237b1fd3813d8edf6b</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25351.106">
diff --git a/eng/Versions.props b/eng/Versions.props
index 8e96ea5ed8..fd71110c9a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,7 +56,7 @@
     <MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
     <!-- Need version that understands UseAppFilters sentinel. -->
     <MicrosoftExtensionsLoggingEventSourceVersion>5.0.1</MicrosoftExtensionsLoggingEventSourceVersion>
-    <SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.0-beta7.25365.101</SystemCommandLineVersion>
     <SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
     <SystemBuffersVersion>4.5.1</SystemBuffersVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
diff --git a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
index 5b953a1c73..14251ece7c 100644
--- a/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
+++ b/src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs
@@ -199,7 +199,7 @@ public string GetDetailedHelp(string commandName, IServiceProvider services, int
                         {
                             if (handler.IsCommandSupported(group.Parser, services))
                             {
-                                return group.GetDetailedHelp(command, services);
+                                return group.GetDetailedHelp(command, services, consoleWidth);
                             }
                             if (handler.FilterInvokeMessage != null)
                             {
@@ -295,15 +295,7 @@ public CommandGroup(string commandPrompt = null)
             /// <exception cref="DiagnosticsException">parsing error</exception>
             internal bool Execute(IReadOnlyList<string> commandLine, IServiceProvider services)
             {
-                IConsoleService consoleService = services.GetService<IConsoleService>();
-                CommandLineConfiguration configuration = new(_rootCommand)
-                {
-                    Output = new ConsoleServiceWrapper(consoleService.Write),
-                    Error = new ConsoleServiceWrapper(consoleService.WriteError)
-                };
-
-                // Parse the command line and invoke the command
-                ParseResult parseResult = configuration.Parse(commandLine);
+                ParseResult parseResult = _rootCommand.Parse(commandLine);
 
                 if (parseResult.Errors.Count > 0)
                 {
@@ -312,7 +304,7 @@ internal bool Execute(IReadOnlyList<string> commandLine, IServiceProvider servic
                     {
                         sb.AppendLine(error.Message);
                     }
-                    string helpText = GetDetailedHelp(parseResult.CommandResult.Command, services);
+                    string helpText = GetDetailedHelp(parseResult.CommandResult.Command, services, int.MaxValue);
                     throw new CommandParsingException(sb.ToString(), helpText);
                 }
                 else
@@ -428,20 +420,18 @@ internal void CreateCommand(Type type, CommandAttribute commandAttribute, Func<I
                 // Build or re-build parser instance after this command is added
             }
 
-            internal string GetDetailedHelp(Command command, IServiceProvider services)
+#pragma warning disable IDE0060 // Remove unused parameter
+// We are waiting on a way to provide the width in the action or the InvocationConfiguration.
+            internal string GetDetailedHelp(Command command, IServiceProvider services, int windowWidth)
+#pragma warning restore IDE0060 // Remove unused parameter
             {
                 StringWriter console = new();
-                CommandLineConfiguration configuration = new(command)
-                {
-                    Output = console
-                };
 
-                // Get the command help by parsing the --help option.
-                // The option is hidden so it doesn't show up in the help text.
+                // Add a stub help option, invoke it, and remove it. The invocation will
+                // write the help text to the console writer.
                 command.Options.Add(new HelpOption() { Hidden = true });
-                // Invoking the help action writes to configuration.Output.
-                command.Parse(["--help"], configuration).Invoke();
-                command.Options.RemoveAt(command.Options.Count - 1); // Remove the help option
+                command.Parse(["--help"]).Invoke(new() { Output = console });
+                command.Options.RemoveAt(command.Options.Count - 1);
 
                 // Get the detailed help if any
                 if (TryGetCommandHandler(command.Name, out CommandHandler handler))
diff --git a/src/Tools/Common/Commands/ProcessStatus.cs b/src/Tools/Common/Commands/ProcessStatus.cs
index e5fa27cd97..c3d0608ebd 100644
--- a/src/Tools/Common/Commands/ProcessStatus.cs
+++ b/src/Tools/Common/Commands/ProcessStatus.cs
@@ -23,7 +23,7 @@ public class ProcessStatusCommandHandler
         public static Command ProcessStatusCommand(string description)
         {
             Command statusCommand = new(name: "ps", description);
-            statusCommand.SetAction((parseResult, ct) => Task.FromResult(ProcessStatus(parseResult.Configuration.Output, parseResult.Configuration.Error)));
+            statusCommand.SetAction((parseResult, ct) => Task.FromResult(ProcessStatus(parseResult.InvocationConfiguration.Output, parseResult.InvocationConfiguration.Error)));
             return statusCommand;
         }
 
diff --git a/src/Tools/Common/ProcessTerminationHandler.cs b/src/Tools/Common/ProcessTerminationHandler.cs
index b5eb515f74..c81fb9a799 100644
--- a/src/Tools/Common/ProcessTerminationHandler.cs
+++ b/src/Tools/Common/ProcessTerminationHandler.cs
@@ -24,15 +24,14 @@ internal sealed class ProcessTerminationHandler : IDisposable
 
         internal static async Task<int> InvokeAsync(ParseResult parseResult, string blockedSignals = "")
         {
-            using ProcessTerminationHandler terminationHandler = ConfigureTerminationHandler(parseResult, blockedSignals);
-            return await parseResult.InvokeAsync(terminationHandler.GetToken).ConfigureAwait(false);
-        }
-
-        private static ProcessTerminationHandler ConfigureTerminationHandler(ParseResult parseResult, string blockedSignals)
-        {
-            // Use custom process terminate handler for the command line tool parse result.
-            parseResult.Configuration.ProcessTerminationTimeout = null;
-            return new ProcessTerminationHandler(blockedSignals);
+            using ProcessTerminationHandler terminationHandler = new(blockedSignals);
+            return await parseResult.InvokeAsync(
+                configuration: new InvocationConfiguration
+                {
+                    // System.CommandLine should not interfere with Ctrl+C
+                    ProcessTerminationTimeout = null,
+                },
+                cancellationToken: terminationHandler.GetToken).ConfigureAwait(false);
         }
 
         private ProcessTerminationHandler(string blockedSignals)
diff --git a/src/Tools/dotnet-counters/Program.cs b/src/Tools/dotnet-counters/Program.cs
index b15dca5412..a4dfecc2d2 100644
--- a/src/Tools/dotnet-counters/Program.cs
+++ b/src/Tools/dotnet-counters/Program.cs
@@ -38,7 +38,7 @@ private static Command MonitorCommand()
 
             monitorCommand.TreatUnmatchedTokensAsErrors = false; // see the logic in Main
 
-            monitorCommand.SetAction(static (parseResult, ct) => new CounterMonitor(parseResult.Configuration.Output, parseResult.Configuration.Error).Monitor(
+            monitorCommand.SetAction(static (parseResult, ct) => new CounterMonitor(parseResult.InvocationConfiguration.Output, parseResult.InvocationConfiguration.Error).Monitor(
                 ct,
                 counters: parseResult.GetValue(CounterOption),
                 processId: parseResult.GetValue(ProcessIdOption),
@@ -77,7 +77,7 @@ private static Command CollectCommand()
 
             collectCommand.TreatUnmatchedTokensAsErrors = false; // see the logic in Main
 
-            collectCommand.SetAction((parseResult, ct) => new CounterMonitor(parseResult.Configuration.Output, parseResult.Configuration.Error).Collect(
+            collectCommand.SetAction((parseResult, ct) => new CounterMonitor(parseResult.InvocationConfiguration.Output, parseResult.InvocationConfiguration.Error).Collect(
                 ct,
                 counters: parseResult.GetValue(CounterOption),
                 processId: parseResult.GetValue(ProcessIdOption),
diff --git a/src/Tools/dotnet-dump/Program.cs b/src/Tools/dotnet-dump/Program.cs
index 6e5d18cca7..5b9ab5262b 100644
--- a/src/Tools/dotnet-dump/Program.cs
+++ b/src/Tools/dotnet-dump/Program.cs
@@ -32,8 +32,8 @@ private static Command CollectCommand()
             };
 
             command.SetAction((parseResult) => new Dumper().Collect(
-                stdOutput: parseResult.Configuration.Output,
-                stdError: parseResult.Configuration.Error,
+                stdOutput: parseResult.InvocationConfiguration.Output,
+                stdError: parseResult.InvocationConfiguration.Error,
                 processId: parseResult.GetValue(ProcessIdOption),
                 output: parseResult.GetValue(OutputOption),
                 diag: parseResult.GetValue(DiagnosticLoggingOption),
@@ -60,7 +60,7 @@ private static Command CollectCommand()
         private static readonly Option<string> OutputOption =
             new("--output", "-o")
             {
-                Description = @"The path where collected dumps should be written. Defaults to '.\dump_YYYYMMDD_HHMMSS.dmp' on Windows and './core_YYYYMMDD_HHMMSS' 
+                Description = @"The path where collected dumps should be written. Defaults to '.\dump_YYYYMMDD_HHMMSS.dmp' on Windows and './core_YYYYMMDD_HHMMSS'
 on Linux where YYYYMMDD is Year/Month/Day and HHMMSS is Hour/Minute/Second. Otherwise, it is the full path and file name of the dump."
             };
 
diff --git a/src/Tools/dotnet-sos/Program.cs b/src/Tools/dotnet-sos/Program.cs
index 89a9e3ffc4..d3ab7cfb60 100644
--- a/src/Tools/dotnet-sos/Program.cs
+++ b/src/Tools/dotnet-sos/Program.cs
@@ -32,8 +32,8 @@ private static Command InstallCommand()
             };
 
             installCommand.SetAction(parseResult => Invoke(
-                parseResult.Configuration.Output,
-                parseResult.Configuration.Error,
+                parseResult.InvocationConfiguration.Output,
+                parseResult.InvocationConfiguration.Error,
                 architecture: parseResult.GetValue(ArchitectureOption),
                 install: true));
 
@@ -53,8 +53,8 @@ private static Command UninstallCommand()
                 description: "Uninstalls SOS and reverts any configuration changes to LLDB.");
 
             uninstallCommand.SetAction(parseResult => Invoke(
-                parseResult.Configuration.Output,
-                parseResult.Configuration.Error,
+                parseResult.InvocationConfiguration.Output,
+                parseResult.InvocationConfiguration.Error,
                 architecture: null,
                 install: false));
 
diff --git a/src/Tools/dotnet-stack/ReportCommand.cs b/src/Tools/dotnet-stack/ReportCommand.cs
index c8f2ecc365..e0db661c54 100644
--- a/src/Tools/dotnet-stack/ReportCommand.cs
+++ b/src/Tools/dotnet-stack/ReportCommand.cs
@@ -193,8 +193,8 @@ public static Command ReportCommand()
             };
 
             reportCommand.SetAction((parseResult, ct) => Report(ct,
-                stdOutput: parseResult.Configuration.Output,
-                stdError: parseResult.Configuration.Error,
+                stdOutput: parseResult.InvocationConfiguration.Output,
+                stdError: parseResult.InvocationConfiguration.Error,
                 processId: parseResult.GetValue(ProcessIdOption),
                 name: parseResult.GetValue(NameOption),
                 duration: parseResult.GetValue(DurationOption)));
diff --git a/src/Tools/dotnet-stack/Symbolicate.cs b/src/Tools/dotnet-stack/Symbolicate.cs
index ce8b10e59b..7b8081d0c8 100644
--- a/src/Tools/dotnet-stack/Symbolicate.cs
+++ b/src/Tools/dotnet-stack/Symbolicate.cs
@@ -306,8 +306,8 @@ public static Command SymbolicateCommand()
             };
 
             symbolicateCommand.SetAction((parseResult, ct) => Task.FromResult(Symbolicate(
-                stdOutput: parseResult.Configuration.Output,
-                stdError: parseResult.Configuration.Error,
+                stdOutput: parseResult.InvocationConfiguration.Output,
+                stdError: parseResult.InvocationConfiguration.Error,
                 inputPath: parseResult.GetValue(InputFileArgument),
                 searchDir: parseResult.GetValue(SearchDirectoryOption),
                 output: parseResult.GetValue(OutputFileOption),
diff --git a/src/Tools/dotnet-trace/CommandLine/Commands/ConvertCommand.cs b/src/Tools/dotnet-trace/CommandLine/Commands/ConvertCommand.cs
index 055051ae5a..cb12b18081 100644
--- a/src/Tools/dotnet-trace/CommandLine/Commands/ConvertCommand.cs
+++ b/src/Tools/dotnet-trace/CommandLine/Commands/ConvertCommand.cs
@@ -103,8 +103,8 @@ public static Command ConvertCommand()
             };
 
             convertCommand.SetAction((parseResult, ct) => Task.FromResult(ConvertFile(
-                stdOut: parseResult.Configuration.Output,
-                stdError: parseResult.Configuration.Error,
+                stdOut: parseResult.InvocationConfiguration.Output,
+                stdError: parseResult.InvocationConfiguration.Error,
                 inputFilename: parseResult.GetValue(InputFileArgument),
                 format: parseResult.GetValue(CommonOptions.ConvertFormatOption),
                 output: parseResult.GetValue(OutputOption