From 751fe5658f51bc6f956a2796f66e4481582f7a37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:26:20 +0000
Subject: [PATCH 1/3] Bump Microsoft.OpenApi.OData and 3 others

Bumps Microsoft.OpenApi.OData from 2.0.0-preview.15 to 2.0.0-preview9
Bumps System.CommandLine to 2.0.0-beta5.25306.1
Bumps System.CommandLine.Hosting from 0.4.0-alpha.22272.1 to 0.4.0-alpha.25306.1
Bumps System.Text.Json to 9.0.6

---
updated-dependencies:
- dependency-name: Microsoft.OpenApi.OData
  dependency-version: 2.0.0-preview9
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.CommandLine
  dependency-version: 2.0.0-beta5.25306.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.CommandLine
  dependency-version: 2.0.0-beta5.25306.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.CommandLine.Hosting
  dependency-version: 0.4.0-alpha.25306.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: System.Text.Json
  dependency-version: 9.0.6
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: System.Text.Json
  dependency-version: 9.0.6
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 performance/resultsComparer/resultsComparer.csproj       | 2 +-
 src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/performance/resultsComparer/resultsComparer.csproj b/performance/resultsComparer/resultsComparer.csproj
index d42ecb451..294fcc217 100644
--- a/performance/resultsComparer/resultsComparer.csproj
+++ b/performance/resultsComparer/resultsComparer.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.6" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
     <PackageReference Include="system.text.json" Version="9.0.6" />
   </ItemGroup>
 
diff --git a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
index 5049653fe..4a884926b 100644
--- a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
+++ b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -36,11 +36,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.15" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview9" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview5" />
-    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.25306.1" />
   </ItemGroup>
 
   <ItemGroup>

From d49d0aebf95ba6d97af7f7d9f3ce22c868ddb4d4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 20 Jun 2025 07:50:02 -0400
Subject: [PATCH 2/3] chore: reverts yoko upgrade

---
 src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
index 4a884926b..44692376c 100644
--- a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
+++ b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -38,7 +38,7 @@
     </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview9" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.15" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview5" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.25306.1" />
   </ItemGroup>

From a5f8721a18e93ee881cfee371ba6d23ce0c55ae4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 30 Jun 2025 09:14:55 -0400
Subject: [PATCH 3/3] fix: migration of hidi to the latest version of
 system.commandline

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
---
 performance/resultsComparer/Program.cs        |  38 +++--
 .../handlers/AsyncCommandHandler.cs           |  14 --
 .../handlers/CompareCommandHandler.cs         |  24 ++-
 .../Extensions/CommandExtensions.cs           |   2 +-
 .../Handlers/AsyncCommandHandler.cs           |  14 --
 .../Handlers/PluginCommandHandler.cs          |   9 +-
 .../Handlers/ShowCommandHandler.cs            |   9 +-
 .../Handlers/TransformCommandHandler.cs       |   9 +-
 .../Handlers/ValidateCommandHandler.cs        |   9 +-
 .../Options/CommandOptions.cs                 | 139 +++++++++++-------
 .../Options/HidiOptions.cs                    |  38 ++---
 src/Microsoft.OpenApi.Hidi/Program.cs         |  15 +-
 .../Services/OpenApiServiceTests.cs           |  15 +-
 13 files changed, 182 insertions(+), 153 deletions(-)
 delete mode 100644 performance/resultsComparer/handlers/AsyncCommandHandler.cs
 delete mode 100644 src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs

diff --git a/performance/resultsComparer/Program.cs b/performance/resultsComparer/Program.cs
index 1c6fb7bc2..9d3c0f871 100644
--- a/performance/resultsComparer/Program.cs
+++ b/performance/resultsComparer/Program.cs
@@ -11,7 +11,8 @@ public class Program
     public static async Task<int> Main(string[] args)
     {
         var rootCommand = CreateRootCommand();
-        return await rootCommand.InvokeAsync(args);
+        var parseResult = rootCommand.Parse(args);
+        return await parseResult.InvokeAsync();
     }
     internal static RootCommand CreateRootCommand()
     {
@@ -21,25 +22,40 @@ internal static RootCommand CreateRootCommand()
         {
             Description = "Compare the benchmark results."
         };
-        var oldResultsPathArgument = new Argument<string>("existingReportPath", () => ExistingReportPath, "The path to the existing benchmark report.");
-        compareCommand.AddArgument(oldResultsPathArgument);
-        var newResultsPathArgument = new Argument<string>("newReportPath", () => ExistingReportPath, "The path to the new benchmark report.");
-        compareCommand.AddArgument(newResultsPathArgument);
-        var logLevelOption = new Option<LogLevel>(["--log-level", "-l"], () => LogLevel.Warning, "The log level to use.");
-        compareCommand.AddOption(logLevelOption);
+        var oldResultsPathArgument = new Argument<string>("existingReportPath")
+        {
+            DefaultValueFactory = (_) => ExistingReportPath,
+            Description = "The path to the existing benchmark report.",
+        };
+        compareCommand.Arguments.Add(oldResultsPathArgument);
+        var newResultsPathArgument = new Argument<string>("newReportPath")
+        {
+            DefaultValueFactory = (_) => ExistingReportPath,
+            Description = "The path to the new benchmark report.",
+        };
+        compareCommand.Arguments.Add(newResultsPathArgument);
+        var logLevelOption = new Option<LogLevel>("--log-level", "-l")
+        {
+            DefaultValueFactory = (_) => LogLevel.Warning,
+            Description = "The log level to use.",
+        };
+        compareCommand.Options.Add(logLevelOption);
         var allPolicyNames = IBenchmarkComparisonPolicy.GetAllPolicies().Select(static p => p.Name).Order(StringComparer.OrdinalIgnoreCase).ToArray();
-        var policiesOption = new Option<string[]>(["--policies", "-p"], () => ["all"], $"The policies to use for comparison: {string.Join(',', allPolicyNames)}.")
+        var policiesOption = new Option<string[]>("--policies", "-p")
         {
-            Arity = ArgumentArity.ZeroOrMore
+            Arity = ArgumentArity.ZeroOrMore,
+            DefaultValueFactory = (_) => ["all"],
+            Description = $"The policies to use for comparison: {string.Join(',', allPolicyNames)}.",
         };
-        compareCommand.AddOption(policiesOption);
-        compareCommand.Handler = new CompareCommandHandler
+        compareCommand.Options.Add(policiesOption);
+        var compareCommandHandler = new CompareCommandHandler
         {
             OldResultsPath = oldResultsPathArgument,
             NewResultsPath = newResultsPathArgument,
             LogLevel = logLevelOption,
             Policies = policiesOption,
         };
+        compareCommand.SetAction(compareCommandHandler.InvokeAsync);
         rootCommand.Add(compareCommand);
         return rootCommand;
     }
diff --git a/performance/resultsComparer/handlers/AsyncCommandHandler.cs b/performance/resultsComparer/handlers/AsyncCommandHandler.cs
deleted file mode 100644
index f4c65b566..000000000
--- a/performance/resultsComparer/handlers/AsyncCommandHandler.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.CommandLine.Invocation;
-using System.Threading.Tasks;
-
-namespace resultsComparer.Handlers;
-
-internal abstract class AsyncCommandHandler : ICommandHandler
-{
-    public int Invoke(InvocationContext context)
-    {
-        throw new InvalidOperationException("This method should not be called");
-    }
-    public abstract Task<int> InvokeAsync(InvocationContext context);
-}
diff --git a/performance/resultsComparer/handlers/CompareCommandHandler.cs b/performance/resultsComparer/handlers/CompareCommandHandler.cs
index ed079953e..1565fdf77 100644
--- a/performance/resultsComparer/handlers/CompareCommandHandler.cs
+++ b/performance/resultsComparer/handlers/CompareCommandHandler.cs
@@ -3,30 +3,38 @@
 using System.CommandLine.Invocation;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using resultsComparer.Models;
 using resultsComparer.Policies;
 
 namespace resultsComparer.Handlers;
 
-internal class CompareCommandHandler : AsyncCommandHandler
+internal class CompareCommandHandler : AsynchronousCommandLineAction
 {
     public required Argument<string> OldResultsPath { get; set; }
     public required Argument<string> NewResultsPath { get; set; }
     public required Option<LogLevel> LogLevel { get; set; }
     public required Option<string[]> Policies { get; set; }
 
-    public override Task<int> InvokeAsync(InvocationContext context)
+    public override Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
     {
-        var cancellationToken = context.BindingContext.GetRequiredService<CancellationToken>();
-        var oldResultsPath = context.ParseResult.GetValueForArgument(OldResultsPath);
-        var newResultsPath = context.ParseResult.GetValueForArgument(NewResultsPath);
-        var policyNames = context.ParseResult.GetValueForOption(Policies) ?? [];
+        var oldResultsPath = parseResult.GetValue(OldResultsPath);
+        var newResultsPath = parseResult.GetValue(NewResultsPath);
+        var policyNames = parseResult.GetValue(Policies) ?? [];
         var policies = IBenchmarkComparisonPolicy.GetSelectedPolicies(policyNames).ToArray();
-        var logLevel = context.ParseResult.GetValueForOption(LogLevel);
+        var logLevel = parseResult.GetValue(LogLevel);
         using var loggerFactory = Logger.ConfigureLogger(logLevel);
         var logger = loggerFactory.CreateLogger<CompareCommandHandler>();
+        if (string.IsNullOrWhiteSpace(oldResultsPath))
+        {
+            logger.LogError("Old results path is required.");
+            return Task.FromResult(1);
+        }
+        if (string.IsNullOrWhiteSpace(newResultsPath))
+        {
+            logger.LogError("New results path is required.");
+            return Task.FromResult(1);
+        }
         return CompareResultsAsync(oldResultsPath, newResultsPath, logger, policies, cancellationToken);
     }
     private static async Task<int> CompareResultsAsync(string existingReportPath, string newReportPath, ILogger logger, IBenchmarkComparisonPolicy[] comparisonPolicies, CancellationToken cancellationToken = default)
diff --git a/src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs b/src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs
index 5b83212d5..1a2dc477d 100644
--- a/src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs
+++ b/src/Microsoft.OpenApi.Hidi/Extensions/CommandExtensions.cs
@@ -12,7 +12,7 @@ public static void AddOptions(this Command command, IReadOnlyList<Option> option
         {
             foreach (var option in options)
             {
-                command.AddOption(option);
+                command.Options.Add(option);
             }
         }
     }
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs
deleted file mode 100644
index 385c00931..000000000
--- a/src/Microsoft.OpenApi.Hidi/Handlers/AsyncCommandHandler.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.CommandLine.Invocation;
-using System.Threading.Tasks;
-
-namespace Microsoft.OpenApi.Hidi.Handlers;
-
-internal abstract class AsyncCommandHandler : ICommandHandler
-{
-    public int Invoke(InvocationContext context)
-    {
-        throw new InvalidOperationException("This method should not be called");
-    }
-    public abstract Task<int> InvokeAsync(InvocationContext context);
-}
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs
index b8f1155c7..99d30397e 100644
--- a/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs
+++ b/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs
@@ -2,26 +2,25 @@
 // Licensed under the MIT license.
 
 using System;
+using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Hidi.Options;
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class PluginCommandHandler : AsyncCommandHandler
+    internal class PluginCommandHandler : AsynchronousCommandLineAction
     {
         public CommandOptions CommandOptions { get; }
         public PluginCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public override async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
         {
-            var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
-            var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
+            var hidiOptions = new HidiOptions(parseResult, CommandOptions);
 
             using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
             var logger = loggerFactory.CreateLogger<PluginCommandHandler>();
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs
index e4f86c6f5..b5d07847d 100644
--- a/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs
+++ b/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs
@@ -2,26 +2,25 @@
 // Licensed under the MIT license.
 
 using System;
+using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Hidi.Options;
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class ShowCommandHandler : AsyncCommandHandler
+    internal class ShowCommandHandler : AsynchronousCommandLineAction
     {
         public CommandOptions CommandOptions { get; set; }
         public ShowCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public override async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
         {
-            var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
-            var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
+            var hidiOptions = new HidiOptions(parseResult, CommandOptions);
 
             using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
             var logger = loggerFactory.CreateLogger<ShowCommandHandler>();
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs
index 3a9a6322c..75b2e8a18 100644
--- a/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs
+++ b/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs
@@ -2,26 +2,25 @@
 // Licensed under the MIT license.
 
 using System;
+using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Hidi.Options;
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class TransformCommandHandler : AsyncCommandHandler
+    internal class TransformCommandHandler : AsynchronousCommandLineAction
     {
         public CommandOptions CommandOptions { get; }
         public TransformCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public override async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
         {
-            var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
-            var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
+            var hidiOptions = new HidiOptions(parseResult, CommandOptions);
 
             using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
             var logger = loggerFactory.CreateLogger<TransformCommandHandler>();
diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs
index b2d4a4653..c884b3ca7 100644
--- a/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs
+++ b/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs
@@ -2,16 +2,16 @@
 // Licensed under the MIT license.
 
 using System;
+using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Hidi.Options;
 
 namespace Microsoft.OpenApi.Hidi.Handlers
 {
-    internal class ValidateCommandHandler : AsyncCommandHandler
+    internal class ValidateCommandHandler : AsynchronousCommandLineAction
     {
         public CommandOptions CommandOptions { get; }
 
@@ -19,10 +19,9 @@ public ValidateCommandHandler(CommandOptions commandOptions)
         {
             CommandOptions = commandOptions;
         }
-        public override async Task<int> InvokeAsync(InvocationContext context)
+        public override async Task<int> InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken = default)
         {
-            var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions);
-            var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken));
+            var hidiOptions = new HidiOptions(parseResult, CommandOptions);
             using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel);
             var logger = loggerFactory.CreateLogger<ValidateCommandHandler>();
             try
diff --git a/src/Microsoft.OpenApi.Hidi/Options/CommandOptions.cs b/src/Microsoft.OpenApi.Hidi/Options/CommandOptions.cs
index 908435c33..cd817011b 100644
--- a/src/Microsoft.OpenApi.Hidi/Options/CommandOptions.cs
+++ b/src/Microsoft.OpenApi.Hidi/Options/CommandOptions.cs
@@ -8,51 +8,86 @@ namespace Microsoft.OpenApi.Hidi.Options
     internal class CommandOptions
     {
         // command option parameters and aliases
-        public readonly Option<string> OpenApiDescriptionOption = new("--openapi", "Input OpenAPI description file path or URL");
-        public readonly Option<string> CsdlOption = new("--csdl", "Input CSDL file path or URL");
-        public readonly Option<string> CsdlFilterOption = new("--csdl-filter", "Comma delimited list of EntitySets or Singletons to filter CSDL on. e.g. tasks,accounts");
-        public readonly Option<FileInfo> OutputOption = new("--output", "The output file path for the generated file.") { Arity = ArgumentArity.ZeroOrOne };
-        public readonly Option<string> OutputFolderOption = new("--output-folder", "The output directory path for the generated files.") { Arity = ArgumentArity.ZeroOrOne };
-        public readonly Option<bool> CleanOutputOption = new("--clean-output", "Overwrite an existing file");
-        public readonly Option<string> VersionOption = new("--version", "OpenAPI specification version");
-        public readonly Option<string> MetadataVersionOption = new("--metadata-version", "Graph metadata version to use.");
-        public readonly Option<string> FormatOption = new("--format", "File format");
-        public readonly Option<bool> TerseOutputOption = new("--terse-output", "Produce terse json output");
-        public readonly Option<string> SettingsFileOption = new("--settings-path", "The configuration file with CSDL conversion settings.");
-        public readonly Option<LogLevel> LogLevelOption = new("--log-level", () => LogLevel.Information, "The log level to use when logging messages to the main output.");
-        public readonly Option<string> FilterByOperationIdsOption = new("--filter-by-operationids", "Filters OpenApiDocument by comma delimited list of OperationId(s) provided");
-        public readonly Option<string> FilterByTagsOption = new("--filter-by-tags", "Filters OpenApiDocument by comma delimited list of Tag(s) provided. Also accepts a single regex.");
-        public readonly Option<string> FilterByCollectionOption = new("--filter-by-collection", "Filters OpenApiDocument by Postman collection provided. Provide path to collection file.");
-        public readonly Option<string> ManifestOption = new("--manifest", "Path to API manifest file to locate and filter an OpenApiDocument");
-        public readonly Option<bool> InlineLocalOption = new("--inline-local", "Inline local $ref instances");
-        public readonly Option<bool> InlineExternalOption = new("--inline-external", "Inline external $ref instances");
-
-        public CommandOptions()
-        {
-            OpenApiDescriptionOption.AddAlias("-d");
-            CsdlOption.AddAlias("--cs");
-            CsdlFilterOption.AddAlias("--csf");
-            OutputOption.AddAlias("-o");
-            OutputFolderOption.AddAlias("--of");
-            CleanOutputOption.AddAlias("--co");
-            VersionOption.AddAlias("-v");
-            MetadataVersionOption.AddAlias("--mv");
-            FormatOption.AddAlias("-f");
-            TerseOutputOption.AddAlias("--to");
-            SettingsFileOption.AddAlias("--sp");
-            LogLevelOption.AddAlias("--ll");
-            FilterByOperationIdsOption.AddAlias("--op");
-            FilterByTagsOption.AddAlias("--t");
-            FilterByCollectionOption.AddAlias("-c");
-            ManifestOption.AddAlias("-m");
-            InlineLocalOption.AddAlias("--il");
-            InlineExternalOption.AddAlias("--ie");
-        }
+        public readonly Option<string> OpenApiDescriptionOption = new("--openapi", "-d")
+        {
+            Description = "Input OpenAPI description file path or URL",
+        };
+        public readonly Option<string> CsdlOption = new("--csdl", "--cs")
+        {
+            Description = "Input CSDL file path or URL",
+        };
+        public readonly Option<string> CsdlFilterOption = new("--csdl-filter", "--csf")
+        {
+            Description = "Comma delimited list of EntitySets or Singletons to filter CSDL on. e.g. tasks,accounts",
+        };
+        public readonly Option<FileInfo> OutputOption = new("--output", "-o")
+        {
+            Description = "The output file path for the generated file.",
+            Arity = ArgumentArity.ZeroOrOne
+        };
+        public readonly Option<string> OutputFolderOption = new("--output-folder", "--of")
+        {
+            Description = "The output directory path for the generated files.",
+            Arity = ArgumentArity.ZeroOrOne
+        };
+        public readonly Option<bool> CleanOutputOption = new("--clean-output", "--co")
+        {
+            Description = "Overwrite an existing file",
+        };
+        public readonly Option<string> VersionOption = new("--version", "-v")
+        {
+            Description = "OpenAPI specification version",
+        };
+        public readonly Option<string> MetadataVersionOption = new("--metadata-version", "--mv")
+        {
+            Description = "Graph metadata version to use.",
+        };
+        public readonly Option<string> FormatOption = new("--format", "-f")
+        {
+            Description = "File format",
+        };
+        public readonly Option<bool> TerseOutputOption = new("--terse-output", "--to")
+        {
+            Description = "Produce terse json output",
+        };
+        public readonly Option<string> SettingsFileOption = new("--settings-path", "--sp")
+        {
+            Description = "The configuration file with CSDL conversion settings.",
+        };
+        public readonly Option<LogLevel> LogLevelOption = new("--log-level", "--ll")
+        {
+            Description = "The log level to use when logging messages to the main output.",
+            DefaultValueFactory = (_) => LogLevel.Information,
+        };
+        public readonly Option<string> FilterByOperationIdsOption = new("--filter-by-operationids", "--op")
+        {
+            Description = "Filters OpenApiDocument by comma delimited list of OperationId(s) provided",
+        };
+        public readonly Option<string> FilterByTagsOption = new("--filter-by-tags", "-t")
+        {
+            Description = "Filters OpenApiDocument by comma delimited list of Tag(s) provided. Also accepts a single regex.",
+        };
+        public readonly Option<string> FilterByCollectionOption = new("--filter-by-collection", "-c")
+        {
+             Description = "Filters OpenApiDocument by Postman collection provided. Provide path to collection file.",
+        };
+        public readonly Option<string> ManifestOption = new("--manifest", "-m")
+        {
+            Description = "Path to API manifest file to locate and filter an OpenApiDocument",
+        };
+        public readonly Option<bool> InlineLocalOption = new("--inline-local", "--il")
+        {
+            Description = "Inline local $ref instances",
+        };
+        public readonly Option<bool> InlineExternalOption = new("--inline-external", "--ie")
+        {
+            Description = "Inline external $ref instances",
+        };
 
         public IReadOnlyList<Option> GetAllCommandOptions()
         {
-            return new List<Option>
-            {
+            return
+            [
                 OpenApiDescriptionOption,
                 CsdlOption,
                 CsdlFilterOption,
@@ -69,40 +104,40 @@ public IReadOnlyList<Option> GetAllCommandOptions()
                 FilterByCollectionOption,
                 InlineLocalOption,
                 InlineExternalOption
-            };
+            ];
         }
 
         public IReadOnlyList<Option> GetValidateCommandOptions()
         {
-            return new List<Option>
-            {
+            return
+            [
                 OpenApiDescriptionOption,
                 LogLevelOption,
-            };
+            ];
         }
 
         public IReadOnlyList<Option> GetShowCommandOptions()
         {
-            return new List<Option>
-            {
+            return
+            [
                 OpenApiDescriptionOption,
                 CsdlOption,
                 CsdlFilterOption,
                 OutputOption,
                 CleanOutputOption,
                 LogLevelOption
-            };
+            ];
         }
 
         public IReadOnlyList<Option> GetPluginCommandOptions()
         {
-            return new List<Option>
-            {
+            return
+            [
                 ManifestOption,
                 OutputFolderOption,
                 CleanOutputOption,
                 LogLevelOption
-            };
+            ];
         }
     }
 
diff --git a/src/Microsoft.OpenApi.Hidi/Options/HidiOptions.cs b/src/Microsoft.OpenApi.Hidi/Options/HidiOptions.cs
index 127a0a14a..b23b22390 100644
--- a/src/Microsoft.OpenApi.Hidi/Options/HidiOptions.cs
+++ b/src/Microsoft.OpenApi.Hidi/Options/HidiOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using System.CommandLine.Parsing;
+using System.CommandLine;
 using System.IO;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -39,26 +39,26 @@ public HidiOptions()
 
         private void ParseHidiOptions(ParseResult parseResult, CommandOptions options)
         {
-            OpenApi = parseResult.GetValueForOption(options.OpenApiDescriptionOption);
-            CsdlFilter = parseResult.GetValueForOption(options.CsdlFilterOption);
-            Csdl = parseResult.GetValueForOption(options.CsdlOption);
-            Output = parseResult.GetValueForOption(options.OutputOption);
-            OutputFolder = parseResult.GetValueForOption(options.OutputFolderOption) is string outputFolderOptionValue && !string.IsNullOrEmpty(outputFolderOptionValue) ? outputFolderOptionValue : defaultOutputFolderValue;
-            CleanOutput = parseResult.GetValueForOption(options.CleanOutputOption);
-            Version = parseResult.GetValueForOption(options.VersionOption);
-            MetadataVersion = parseResult.GetValueForOption(options.MetadataVersionOption);
-            OpenApiFormat = parseResult.GetValueForOption(options.FormatOption);
-            TerseOutput = parseResult.GetValueForOption(options.TerseOutputOption);
-            SettingsConfig = parseResult.GetValueForOption(options.SettingsFileOption) is string configOptionValue && !string.IsNullOrEmpty(configOptionValue) ? SettingsUtilities.GetConfiguration(configOptionValue) : null;
-            LogLevel = parseResult.GetValueForOption(options.LogLevelOption);
-            InlineLocal = parseResult.GetValueForOption(options.InlineLocalOption);
-            InlineExternal = parseResult.GetValueForOption(options.InlineExternalOption);
+            OpenApi = parseResult.GetValue(options.OpenApiDescriptionOption);
+            CsdlFilter = parseResult.GetValue(options.CsdlFilterOption);
+            Csdl = parseResult.GetValue(options.CsdlOption);
+            Output = parseResult.GetValue(options.OutputOption);
+            OutputFolder = parseResult.GetValue(options.OutputFolderOption) is string outputFolderOptionValue && !string.IsNullOrEmpty(outputFolderOptionValue) ? outputFolderOptionValue : defaultOutputFolderValue;
+            CleanOutput = parseResult.GetValue(options.CleanOutputOption);
+            Version = parseResult.GetValue(options.VersionOption);
+            MetadataVersion = parseResult.GetValue(options.MetadataVersionOption);
+            OpenApiFormat = parseResult.GetValue(options.FormatOption);
+            TerseOutput = parseResult.GetValue(options.TerseOutputOption);
+            SettingsConfig = parseResult.GetValue(options.SettingsFileOption) is string configOptionValue && !string.IsNullOrEmpty(configOptionValue) ? SettingsUtilities.GetConfiguration(configOptionValue) : null;
+            LogLevel = parseResult.GetValue(options.LogLevelOption);
+            InlineLocal = parseResult.GetValue(options.InlineLocalOption);
+            InlineExternal = parseResult.GetValue(options.InlineExternalOption);
             FilterOptions = new()
             {
-                FilterByOperationIds = parseResult.GetValueForOption(options.FilterByOperationIdsOption),
-                FilterByTags = parseResult.GetValueForOption(options.FilterByTagsOption),
-                FilterByCollection = parseResult.GetValueForOption(options.FilterByCollectionOption),
-                FilterByApiManifest = parseResult.GetValueForOption(options.ManifestOption)
+                FilterByOperationIds = parseResult.GetValue(options.FilterByOperationIdsOption),
+                FilterByTags = parseResult.GetValue(options.FilterByTagsOption),
+                FilterByCollection = parseResult.GetValue(options.FilterByCollectionOption),
+                FilterByApiManifest = parseResult.GetValue(options.ManifestOption)
             };
         }
     }
diff --git a/src/Microsoft.OpenApi.Hidi/Program.cs b/src/Microsoft.OpenApi.Hidi/Program.cs
index ddbb96fe9..969f49a7e 100644
--- a/src/Microsoft.OpenApi.Hidi/Program.cs
+++ b/src/Microsoft.OpenApi.Hidi/Program.cs
@@ -16,7 +16,8 @@ static Task<int> Main(string[] args)
             var rootCommand = CreateRootCommand();
 
             // Parse the incoming args and invoke the handler
-            return rootCommand.InvokeAsync(args);
+            var parseResult = rootCommand.Parse(args);
+            return parseResult.InvokeAsync();
         }
 
         internal static RootCommand CreateRootCommand()
@@ -28,22 +29,26 @@ internal static RootCommand CreateRootCommand()
             var validateCommand = new Command("validate");
             validateCommand.Description = "Validate an OpenAPI document.";
             validateCommand.AddOptions(commandOptions.GetValidateCommandOptions());
-            validateCommand.Handler = new ValidateCommandHandler(commandOptions);
+            var validateCommandHandler = new ValidateCommandHandler(commandOptions);
+            validateCommand.SetAction(validateCommandHandler.InvokeAsync);
 
             var transformCommand = new Command("transform");
             transformCommand.Description = "Transform an OpenAPI or CSDL document into a JSON/YAML OpenAPI v2/v3 document.";
             transformCommand.AddOptions(commandOptions.GetAllCommandOptions());
-            transformCommand.Handler = new TransformCommandHandler(commandOptions);
+            var transformCommandHandler = new TransformCommandHandler(commandOptions);
+            transformCommand.SetAction(transformCommandHandler.InvokeAsync);
 
             var showCommand = new Command("show");
             showCommand.Description = "Create a visual representation of the paths in an OpenAPI document.";
             showCommand.AddOptions(commandOptions.GetShowCommandOptions());
-            showCommand.Handler = new ShowCommandHandler(commandOptions);
+            var showCommandHandler = new ShowCommandHandler(commandOptions);
+            showCommand.SetAction(showCommandHandler.InvokeAsync);
 
             var pluginCommand = new Command("plugin");
             pluginCommand.Description = "Create manifest files for an OpenAI plugin [preview]";
             pluginCommand.AddOptions(commandOptions.GetPluginCommandOptions());
-            pluginCommand.Handler = new PluginCommandHandler(commandOptions);
+            var pluginCommandHandler = new PluginCommandHandler(commandOptions);
+            pluginCommand.SetAction(pluginCommandHandler.InvokeAsync);
 
             rootCommand.Add(showCommand);
             rootCommand.Add(transformCommand);
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
index af65700c7..05345aaf8 100644
--- a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
+++ b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -312,10 +312,9 @@ public async Task InvokeTransformCommandAsync()
             var openapi = Path.Combine(".", "UtilityFiles", "SampleOpenApi.yml");
             var args = new[] { "transform", "-d", openapi, "-o", "sample.json", "--co" };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.First(c => c.Name == "transform").Handler;
-            var context = new InvocationContext(parseResult);
+            var handler = Assert.IsType<AsynchronousCommandLineAction>(rootCommand.Subcommands.First(c => c.Name == "transform").Action, exactMatch: false);
 
-            await handler!.InvokeAsync(context);
+            await handler.InvokeAsync(parseResult);
 
             var output = await File.ReadAllTextAsync("sample.json");
             Assert.NotEmpty(output);
@@ -329,10 +328,9 @@ public async Task InvokeShowCommandAsync()
             var openApi = Path.Combine(".", "UtilityFiles", "SampleOpenApi.yml");
             var args = new[] { "show", "-d", openApi, "-o", "sample.md" };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.First(c => c.Name == "show").Handler;
-            var context = new InvocationContext(parseResult);
+            var handler = Assert.IsType<AsynchronousCommandLineAction>(rootCommand.Subcommands.First(c => c.Name == "show").Action, exactMatch: false);
 
-            await handler!.InvokeAsync(context);
+            await handler.InvokeAsync(parseResult);
 
             var output = await File.ReadAllTextAsync("sample.md");
             Assert.Contains("graph LR", output, StringComparison.Ordinal);
@@ -345,10 +343,9 @@ public async Task InvokePluginCommandAsync()
             var manifest = Path.Combine(".", "UtilityFiles", "exampleapimanifest.json");
             var args = new[] { "plugin", "-m", manifest, "--of", AppDomain.CurrentDomain.BaseDirectory };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.First(c => c.Name == "plugin").Handler;
-            var context = new InvocationContext(parseResult);
+            var handler = Assert.IsType<AsynchronousCommandLineAction>(rootCommand.Subcommands.First(c => c.Name == "plugin").Action, exactMatch: false);
 
-            await handler!.InvokeAsync(context);
+            await handler.InvokeAsync(parseResult);
 
             using var jsDoc = JsonDocument.Parse(await File.ReadAllTextAsync("ai-plugin.json"));
             var openAiManifest = OpenAIPluginManifest.Load(jsDoc.RootElement);