Update to public beta5 of System.CommandLine (#240)

Author: MadsBrun

nuget.config

@@ -3,10 +3,6 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <add
-      key="command-line-api"
-      value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json"
-    />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

src/DotnetSops.CommandLine/Commands/DecryptCommand.cs

@@ -7,23 +7,23 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class DecryptCommand : CliCommand
+internal class DecryptCommand : Command
 {
     public const string CommandName = "decrypt";
 
     private readonly IServiceProvider _serviceProvider;
 
-    private readonly CliOption<FileInfo?> _projectFileOption = new("--project", "-p")
+    private readonly Option<FileInfo?> _projectFileOption = new("--project", "-p")
     {
         Description = Properties.Resources.DecryptCommandProjectOptionDescription,
     };
 
-    private readonly CliOption<string?> _userSecretsIdOption = new("--id")
+    private readonly Option<string?> _userSecretsIdOption = new("--id")
     {
         Description = Properties.Resources.DecryptCommandSecretsIdOptionDescription,
     };
 
-    private readonly CliOption<FileInfo> _inputFileOption = new("--file")
+    private readonly Option<FileInfo> _inputFileOption = new("--file")
     {
         Description = Properties.Resources.DecryptCommandFileOptionDescription,
         DefaultValueFactory = _ => new FileInfo("secrets.json"),

src/DotnetSops.CommandLine/Commands/DownloadSopsCommand.cs

@@ -5,7 +5,7 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class DownloadSopsCommand : CliCommand
+internal class DownloadSopsCommand : Command
 {
     public const string CommandName = "download-sops";
 

src/DotnetSops.CommandLine/Commands/EncryptCommand.cs

@@ -8,23 +8,23 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class EncryptCommand : CliCommand
+internal class EncryptCommand : Command
 {
     public const string CommandName = "encrypt";
 
     private readonly IServiceProvider _serviceProvider;
 
-    private readonly CliOption<FileInfo?> _projectFileOption = new("--project", "-p")
+    private readonly Option<FileInfo?> _projectFileOption = new("--project", "-p")
     {
         Description = Properties.Resources.EncryptCommandProjectOptionDescription,
     };
 
-    private readonly CliOption<string> _userSecretsIdOption = new("--id")
+    private readonly Option<string> _userSecretsIdOption = new("--id")
     {
         Description = Properties.Resources.EncryptCommandSecretsIdOptionDescription,
     };
 
-    private readonly CliOption<FileInfo> _outputFileOption = new("--file")
+    private readonly Option<FileInfo> _outputFileOption = new("--file")
     {
         Description = Properties.Resources.EncryptCommandFileOptionDescription,
         DefaultValueFactory = (_) => new FileInfo("secrets.json"),

src/DotnetSops.CommandLine/Commands/InitializeCommand.cs

@@ -7,7 +7,7 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class InitializeCommand : CliCommand
+internal class InitializeCommand : Command
 {
     public const string CommandName = "init";
 

src/DotnetSops.CommandLine/Commands/RootDotnetSopsCommand.cs

@@ -4,9 +4,9 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class RootDotnetSopsCommand : CliRootCommand
+internal class RootDotnetSopsCommand : RootCommand
 {
-    private readonly CliOption<bool> _verboseOption = new("--verbose")
+    private readonly Option<bool> _verboseOption = new("--verbose")
     {
         Recursive = true,
         Description = Properties.Resources.RootDotnetSopsCommandVerboseOptionDescription,

src/DotnetSops.CommandLine/Commands/RunCommand.cs

@@ -5,19 +5,19 @@
 
 namespace DotnetSops.CommandLine.Commands;
 
-internal class RunCommand : CliCommand
+internal class RunCommand : Command
 {
     public const string CommandName = "run";
 
     private readonly IServiceProvider _serviceProvider;
 
-    private readonly CliOption<FileInfo> _inputFileOption = new("--file")
+    private readonly Option<FileInfo> _inputFileOption = new("--file")
     {
         Description = Properties.Resources.RunCommandFileOptionDescription,
         DefaultValueFactory = _ => new FileInfo("secrets.json"),
     };
 
-    private readonly CliArgument<string[]> _runArguments = new("dotnetArguments")
+    private readonly Argument<string[]> _runArguments = new("dotnetArguments")
     {
         Description = Properties.Resources.RunCommandArgumentsDescription,
     };

src/DotnetSops.CommandLine/DotnetSops.CommandLine.csproj

@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
     <PackageReference Include="Spectre.Console" Version="0.50.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.24528.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta5.25306.1" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
   <ItemGroup>

src/DotnetSops.CommandLine/Program.cs

@@ -45,7 +45,7 @@
 
 var rootCommand = new RootDotnetSopsCommand(serviceProvider);
 
-var config = new CliConfiguration(rootCommand)
+var config = new CommandLineConfiguration(rootCommand)
 {
     Output = new ReplaceUsageHelpTextWriter(Console.Out),
 };

test/DotnetSops.CommandLine.Tests/Commands/DecryptCommandTests.cs

@@ -111,7 +111,7 @@ await File.WriteAllTextAsync(
 
         var inputPath = "secrets.json";
 
-        var config = new CliConfiguration(command);
+        var config = new CommandLineConfiguration(command);
 
         // Act
         var exitCode = await config.InvokeAsync($"--id {id} --file {inputPath}");
@@ -179,7 +179,7 @@ await File.WriteAllTextAsync(
 
         var inputPath = "secrets.json";
 
-        var config = new CliConfiguration(command);
+        var config = new CommandLineConfiguration(command);
 
         // Act
         var exitCode = await config.InvokeAsync($"--id {id} --file {inputPath}");
@@ -205,7 +205,7 @@ public async Task DecryptCommand_InvalidInputFile_Fails()
 
         var inputPath = "secrets.json";
 
-        var config = new CliConfiguration(command);
+        var config = new CommandLineConfiguration(command);
 
         // Act
         var exitCode = await config.InvokeAsync($"--id {id} --file {inputPath}");
@@ -291,7 +291,7 @@ await File.WriteAllTextAsync(
             """
         );
 
-        var config = new CliConfiguration(command);
+        var config = new CommandLineConfiguration(command);
 
         // Act
         var exitCode = await config.InvokeAsync($"");
@@ -338,7 +338,7 @@ await File.WriteAllTextAsync(
             """
         );
 
-        var config = new CliConfiguration(command);
+        var config = new CommandLineConfiguration(command);
 
         // Act
         var exitCode = await config.InvokeAsync($"");
@@ -394,7 +394,7 @@ public async Task HelpFlag_PrintHelp(string option)
         // Arrange
         var command = new RootDotnetSopsCommand(_serviceProvider);
         var output = new StringWriter();
-        var config = new CliConfiguration(command)
+        var config = new CommandLineConfiguration(command)
         {
             Output = new ReplaceUsageHelpTextWriter(output, "testhost"),
         };