From b815e5297106d131c7c22341f611afcef25ed97d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 12:42:14 +0000
Subject: [PATCH 1/2] Update dependencies from
 https://github.com/dotnet/command-line-api build 20230626.1

System.CommandLine
 From Version 2.0.0-beta4.23307.1 -> To Version 2.0.0-beta4.23326.1
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c19d5eaf36f..8b9c49f5e73 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,9 +19,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
+    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23326.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
+      <Sha>f6ff2f1a94a58617e744f8fe0d469a2a420a6259</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 36e5e42abe6..69831cf7790 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,7 +16,7 @@
   <PropertyGroup>
     <!-- Maestro-managed Package Versions - Ordered by repo name -->
     <!-- Dependencies from https://github.com/dotnet/command-line-api -->
-    <SystemCommandLinePackageVersion>2.0.0-beta4.23307.1</SystemCommandLinePackageVersion>
+    <SystemCommandLinePackageVersion>2.0.0-beta4.23326.1</SystemCommandLinePackageVersion>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23325.2</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.7.23325.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>

From 74b706d8ecd9a0120e595e64fc307300740e0afe Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Sat, 8 Jul 2023 12:47:34 -0700
Subject: [PATCH 2/2] React to CliAction changes

---
 .../Commands/ExecutableCommand.cs                            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs b/tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
index 37ea2658d33..a6aa653b08f 100644
--- a/tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
+++ b/tools/Microsoft.TemplateEngine.Authoring.CLI/Commands/ExecutableCommand.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using System.CommandLine.Invocation;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
 
@@ -28,13 +29,13 @@ internal ExecutableCommand(string name, string? description = null)
         /// </summary>
         protected abstract Task<int> ExecuteAsync(TModel args, ILoggerFactory loggerFactory, CancellationToken cancellationToken);
 
-        private sealed class CommandAction : CliAction
+        private sealed class CommandAction : AsynchronousCliAction
         {
             private readonly ExecutableCommand<TModel> _command;
 
             public CommandAction(ExecutableCommand<TModel> command) => _command = command;
 
-            public override int Invoke(ParseResult parseResult) => InvokeAsync(parseResult).GetAwaiter().GetResult();
+            public int Invoke(ParseResult parseResult) => InvokeAsync(parseResult).GetAwaiter().GetResult();
 
             public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
             {