[VMR] Codeflow d7d8500-d7d8500

[[ commit created by automation ]]

Author: dotnet-maestro[bot]

src/Microsoft.Diagnostics.DebugServices.Implementation/CommandService.cs

@@ -300,15 +300,8 @@ 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)
                 {

src/Tools/dotnet-trace/CommandLine/Commands/CollectCommand.cs

@@ -54,7 +54,7 @@ private static void ConsoleWriteLine(string str)
         /// <param name="stoppingEventPayloadFilter">A string, parsed as [payload_field_name]:[payload_field_value] pairs separated by commas, that will stop the trace upon hitting an event with a matching payload. Requires `--stopping-event-provider-name` and `--stopping-event-event-name` to be set.</param>
         /// <param name="rundown">Collect rundown events.</param>
         /// <returns></returns>
-        private static async Task<int> Collect(CancellationToken ct, CommandLineConfiguration cliConfig, int processId, FileInfo output, uint buffersize, string providers, string profile, TraceFileFormat format, TimeSpan duration, string clrevents, string clreventlevel, string name, string diagnosticPort, bool showchildio, bool resumeRuntime, string stoppingEventProviderName, string stoppingEventEventName, string stoppingEventPayloadFilter, bool? rundown, string dsrouter)
+        private static async Task<int> Collect(CancellationToken ct, InvocationConfiguration cliConfig, int processId, FileInfo output, uint buffersize, string providers, string profile, TraceFileFormat format, TimeSpan duration, string clrevents, string clreventlevel, string name, string diagnosticPort, bool showchildio, bool resumeRuntime, string stoppingEventProviderName, string stoppingEventEventName, string stoppingEventPayloadFilter, bool? rundown, string dsrouter)
         {
             bool collectionStopped = false;
             bool cancelOnEnter = true;
@@ -587,7 +587,7 @@ public static Command CollectCommand()
 
             collectCommand.SetAction((parseResult, ct) => Collect(
                 ct,
-                cliConfig: parseResult.Configuration,
+                cliConfig: parseResult.InvocationConfiguration,
                 processId: parseResult.GetValue(CommonOptions.ProcessIdOption),
                 output: parseResult.GetValue(OutputPathOption),
                 buffersize: parseResult.GetValue(CircularBufferOption),