Upgrade to Spectre.Console.Cli 0.53.0

0xced · 0xced · commit 1e5b806f6a0f · 2025-11-07T13:09:58.000+01:00
diff --git a/src/nugraph/CancelableCommand.cs b/src/nugraph/CancelableCommand.cs
diff --git a/src/nugraph/GraphCommand.cs b/src/nugraph/GraphCommand.cs
@@ -28,9 +28,9 @@ internal sealed partial class FileOrPackage : OneOfBase<FileSystemInfo, PackageI
 [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global", Justification = "Instantiated by Spectre.Console.Cli through reflection")]
 [SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by Spectre.Console.Cli through reflection")]
 [Description("Generates dependency graphs for .NET projects and NuGet packages.")]
-internal sealed class GraphCommand(ProgramEnvironment environment, CancellationToken cancellationToken) : CancelableCommand<GraphCommandSettings>(cancellationToken)
+internal sealed class GraphCommand(ProgramEnvironment environment) : AsyncCommand<GraphCommandSettings>
 {
-    protected override async Task<int> ExecuteAsync(CommandContext commandContext, GraphCommandSettings settings, CancellationToken cancellationToken)
+    public override async Task<int> ExecuteAsync(CommandContext commandContext, GraphCommandSettings settings, CancellationToken cancellationToken)
     {
         var stdOut = environment.StdOut;
         var console = environment.ConsoleErr;
diff --git a/src/nugraph/Program.cs b/src/nugraph/Program.cs
@@ -48,14 +48,13 @@ public async Task<int> RunAsync(params string[] args)
             config.SetApplicationVersion(typeof(Program).Assembly.GetVersion());
             config.ConfigureConsole(environment.ConsoleOut);
             config.Settings.Registrar.RegisterInstance(environment);
-            config.Settings.Registrar.RegisterInstance(cancellationTokenSource.Token);
             config.SetExceptionHandler((exception, _) =>
             {
                 var consoleErr = environment.ConsoleErr;
                 switch (exception)
                 {
                     case OperationCanceledException when cancellationTokenSource.IsCancellationRequested:
-                        return 130; // https://github.com/spectreconsole/spectre.console/issues/701#issuecomment-2342979700
+                        return config.Settings.CancellationExitCode;
                     case Exception when ExceptionTransformer.GetError(exception) is { } error:
                         consoleErr.Write(error.Pretty);
                         if (error.ExitCode.HasValue)
@@ -85,6 +84,6 @@ public async Task<int> RunAsync(params string[] args)
             });
         });
 
-        return await app.RunAsync(args);
+        return await app.RunAsync(args, cancellationTokenSource.Token);
     }
 }
diff --git a/src/nugraph/nugraph.csproj b/src/nugraph/nugraph.csproj
@@ -54,7 +54,7 @@
     <PackageReference Include="OneOf" Version="3.0.271" />
     <PackageReference Include="OneOf.SourceGenerator" Version="3.0.271" PrivateAssets="all" />
     <PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.51.1" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.53.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/nugraph/packages.lock.json b/src/nugraph/packages.lock.json
@@ -75,11 +75,12 @@
       },
       "Spectre.Console.Cli": {
         "type": "Direct",
-        "requested": "[0.51.1, )",
-        "resolved": "0.51.1",
-        "contentHash": "LqJjjug5f8ipFFzhwBaQHMXt8+uuJAxu3dsyAxF+Jyva9yHW0P3iP6s1NpwVqt0Yk11n6/f9qipyiEn0zBKBiQ==",
+        "requested": "[0.53.0, )",
+        "resolved": "0.53.0",
+        "contentHash": "9m26DC9IGMjA+qjlEtO2BsukmbymNvrXUtu5sh3sc2uCKHdawqVMwcnmiKO/bKKG0pHIzI1O/H2Qr/m2uh+rQw==",
         "dependencies": {
-          "Spectre.Console": "0.51.1"
+          "OpenCli.Sources": "0.5.0",
+          "Spectre.Console": "0.53.0"
         }
       },
       "Microsoft.Build.Framework": {
@@ -92,11 +93,31 @@
         "resolved": "17.11.31",
         "contentHash": "eYFod+GPNjpcjviyz2xjNIkNuj4aowrucHGQZxs9xWfJmbv8evo/Nud56Kb38x2prbKnCEfZhbhIBc2e/qlZAA=="
       },
+      "Namotion.Reflection": {
+        "type": "Transitive",
+        "resolved": "3.4.2",
+        "contentHash": "ZHrvPdAg7zV78iOTiH9ua+34rBfn4iH6Bjfo2bzUHOGD3KkjGUvqxBFy+v9p6qwV+GEeYWl4NOqXH8tVcZOMpw=="
+      },
       "Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
+      "NJsonSchema": {
+        "type": "Transitive",
+        "resolved": "11.4.0",
+        "contentHash": "0q6mr6eJk/D4jPFKyRwAPauedZK60yFE5rjA3+aqCdQm9kGE9J8xygRrLfk0Ms8wBviWbLlaZYzqAteG3b6Yag==",
+        "dependencies": {
+          "NJsonSchema.Annotations": "11.4.0",
+          "Namotion.Reflection": "3.4.2",
+          "Newtonsoft.Json": "13.0.3"
+        }
+      },
+      "NJsonSchema.Annotations": {
+        "type": "Transitive",
+        "resolved": "11.4.0",
+        "contentHash": "fKAGyIU9s18e9GAdNbEr2PmZdpBqb1RdAr2+EHHrdkSZNoYtwFcmN6syJaxYxeEFegoLbC3e+EU5eb7Tt1ph3Q=="
+      },
       "NuGet.Common": {
         "type": "Transitive",
         "resolved": "6.14.0",
@@ -164,10 +185,18 @@
         "resolved": "6.14.0",
         "contentHash": "4v4blkhCv8mpKtfx+z0G/X0daVCzdIaHSC51GkUspugi5JIMn2Bo8xm5PdZYF0U68gOBfz/+aPWMnpRd85Jbow=="
       },
+      "OpenCli.Sources": {
+        "type": "Transitive",
+        "resolved": "0.5.0",
+        "contentHash": "5FgwoxpZy9Qy7MsKHb2hZBTWXEvg7JCPuNnaqsn2g0/X9oWQVThYQ1nND1xJrq8P1aw+Gh8sirV1HbefeqSalw==",
+        "dependencies": {
+          "NJsonSchema": "11.4.0"
+        }
+      },
       "Spectre.Console": {
         "type": "Transitive",
-        "resolved": "0.51.1",
-        "contentHash": "84xNywgnaG8XgOypnZAL+EZUbhCGE0umj7fuMrSI6esdE74HYHRoeBioeMUJXPiCt7iBDKHLwiBcg0IliYIIxA=="
+        "resolved": "0.53.0",
+        "contentHash": "m2iv8Egfywp7FaNLKCmCFHbSf36D4ctzZKvlAK9NXMyGLh6L+CnrZWK8o+LOYsoAS1jtoHn0W1BT0W8vuq/FUw=="
       },
       "System.Collections.Immutable": {
         "type": "Transitive",
diff --git a/tests/nugraph.Tests/nugraph.Tests.csproj b/tests/nugraph.Tests/nugraph.Tests.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="AwesomeAssertions" Version="9.2.0" />
     <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
-    <PackageReference Include="Spectre.Console.Testing" Version="0.51.1" />
+    <PackageReference Include="Spectre.Console.Testing" Version="0.53.0" />
     <PackageReference Include="TUnit.Engine" Version="0.67.10" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ internal sealed partial class FileOrPackage : OneOfBase<FileSystemInfo, PackageI`
`28`	`28`	`[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global", Justification = "Instantiated by Spectre.Console.Cli through reflection")]`
`29`	`29`	`[SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes", Justification = "Instantiated by Spectre.Console.Cli through reflection")]`
`30`	`30`	`[Description("Generates dependency graphs for .NET projects and NuGet packages.")]`
`31`		`-internal sealed class GraphCommand(ProgramEnvironment environment, CancellationToken cancellationToken) : CancelableCommand<GraphCommandSettings>(cancellationToken)`
	`31`	`+internal sealed class GraphCommand(ProgramEnvironment environment) : AsyncCommand<GraphCommandSettings>`
`32`	`32`	`{`
`33`		`- protected override async Task<int> ExecuteAsync(CommandContext commandContext, GraphCommandSettings settings, CancellationToken cancellationToken)`
	`33`	`+ public override async Task<int> ExecuteAsync(CommandContext commandContext, GraphCommandSettings settings, CancellationToken cancellationToken)`
`34`	`34`	`{`
`35`	`35`	`var stdOut = environment.StdOut;`
`36`	`36`	`var console = environment.ConsoleErr;`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,13 @@ public async Task<int> RunAsync(params string[] args)`
`48`	`48`	`config.SetApplicationVersion(typeof(Program).Assembly.GetVersion());`
`49`	`49`	`config.ConfigureConsole(environment.ConsoleOut);`
`50`	`50`	`config.Settings.Registrar.RegisterInstance(environment);`
`51`		`- config.Settings.Registrar.RegisterInstance(cancellationTokenSource.Token);`
`52`	`51`	`config.SetExceptionHandler((exception, _) =>`
`53`	`52`	`{`
`54`	`53`	`var consoleErr = environment.ConsoleErr;`
`55`	`54`	`switch (exception)`
`56`	`55`	`{`
`57`	`56`	`case OperationCanceledException when cancellationTokenSource.IsCancellationRequested:`
`58`		`- return 130; // https://github.com/spectreconsole/spectre.console/issues/701#issuecomment-2342979700`
	`57`	`+ return config.Settings.CancellationExitCode;`
`59`	`58`	`case Exception when ExceptionTransformer.GetError(exception) is { } error:`
`60`	`59`	`consoleErr.Write(error.Pretty);`
`61`	`60`	`if (error.ExitCode.HasValue)`
`@@ -85,6 +84,6 @@ public async Task<int> RunAsync(params string[] args)`
`85`	`84`	`});`
`86`	`85`	`});`
`87`	`86`
`88`		`- return await app.RunAsync(args);`
	`87`	`+ return await app.RunAsync(args, cancellationTokenSource.Token);`
`89`	`88`	`}`
`90`	`89`	`}`