Update system.commandline library

Author: calebkiage

src/Commands/Authentication/LoginCommand.cs

@@ -19,20 +19,20 @@ public LoginCommand(AuthenticationServiceFactory authenticationServiceFactory) {
 
     public Command Build() {
         var loginCommand = new Command("login", "Login and store the session for use in subsequent commands");
-        var scopes = new Option<string>("--scopes", "The login scopes e.g. User.Read");
+        var scopes = new Option<string>("--scopes", "The login scopes e.g. User.Read") {
+            Arity = ArgumentArity.OneOrMore
+        };
         scopes.IsRequired = true;
-        scopes.Arity = ArgumentArity.OneOrMore;
         loginCommand.AddOption(scopes);
 
         var strategy = new Option<AuthenticationStrategy>("--strategy", () => Constants.defaultAuthStrategy, "The authentication strategy to use.");
         loginCommand.AddOption(strategy);
-
-        loginCommand.Handler = CommandHandler.Create<string[], AuthenticationStrategy, IHost>(async (scopes, strategy, host) =>
+        loginCommand.SetHandler<string[], AuthenticationStrategy, IHost>(async (scopes, strategy, host) =>
         {
             var options = host.Services.GetRequiredService<IOptionsMonitor<AuthenticationOptions>>().CurrentValue;
             var authService = await this.authenticationServiceFactory.GetAuthenticationServiceAsync(strategy, options?.TenantId, options?.ClientId);
             await authService.LoginAsync(scopes);
-        });
+        }, scopes, strategy);
 
         return loginCommand;
     }

src/Commands/Authentication/LogoutCommand.cs

@@ -15,8 +15,7 @@ public LogoutCommand(LogoutService logoutService) {
 
     public Command Build() {
         var logoutCommand = new Command("logout", "Logout by deleting the stored session used in commands");
-
-        logoutCommand.Handler = CommandHandler.Create(() =>
+        logoutCommand.SetHandler(() =>
         {
             this.logoutService.Logout();
         });

src/Program.cs

@@ -21,6 +21,7 @@
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace Microsoft.Graph.Cli
 {
@@ -65,24 +66,32 @@ static async Task<int> Main(string[] args)
             using var httpClient = KiotaClientFactory.Create(finalHandler);
             var core = new HttpClientRequestAdapter(authProvider, httpClient: httpClient);
             var client = new GraphClient(core);
-            var builder = BuildCommandLine(client);
+            var rootCommand = client.BuildCommand();
+            rootCommand.Description = "Microsoft Graph CLI";
 
+            var commands = new List<Command>();
             var loginCommand = new LoginCommand(authServiceFactory);
-            builder.AddCommand(loginCommand.Build());
+            commands.Add(loginCommand.Build());
 
             var logoutCommand = new LogoutCommand(new LogoutService());
-            builder.AddCommand(logoutCommand.Build());
+            commands.Add(logoutCommand.Build());
+
+            var builder = BuildCommandLine(client, commands);
 
             var parser = builder.UseHost(CreateHostBuilder).UseDefaults().Build();
 
             return await parser.InvokeAsync(args);
         }
 
-        static CommandLineBuilder BuildCommandLine(GraphClient client)
+        static CommandLineBuilder BuildCommandLine(GraphClient client, IEnumerable<Command> commands)
         {
             var rootCommand = client.BuildCommand();
             rootCommand.Description = "Microsoft Graph CLI";
 
+            foreach (var command in commands) {
+                rootCommand.AddCommand(command);
+            }
+
             return new CommandLineBuilder(rootCommand);
         }
 

src/msgraph-cli.csproj

@@ -25,12 +25,12 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.25" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.0.26" />
     <PackageReference Include="Microsoft.Kiota.Authentication.Azure" Version="1.0.6" />
     <PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.0.16" />
     <PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.0.6" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
-    <PackageReference Include="System.CommandLine.Hosting" Version="0.3.0-alpha.21216.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
+    <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.21617.1" />
   </ItemGroup>
 
   <ItemGroup>