Merge pull request #1398 from christianhelle/copilot/update-spectre-console-cli

christianhelle · web-flow · commit 8304b3ddc9a3 · 2025-11-16T22:40:00.000+01:00
Update Spectre.Console.Cli to 0.53.0 and fix breaking Execute signature
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/AutoRestCommandTests.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -36,7 +37,7 @@ public void CreateGenerator_Should_NotNull(AutoRestCommand sut, AutoRestCommand.
         [Theory, AutoMoqData]
         public void Execute_Should_NotThrow(AutoRestCommand sut, AutoRestCommand.AutoRestSettings settings)
         {
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
 
         [Theory, AutoMoqData]
@@ -121,7 +122,7 @@ public void OnExecute_Should_Create_Generator(
             AutoRestCommand sut,
             AutoRestCommand.AutoRestSettings settings)
         {
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             Mock.Get(factory)
                 .Verify(c => c.Create(
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/JMeterCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/JMeterCommandTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -31,7 +32,7 @@ public void OutputFile_Should_NotBeNullOrWhiteSpace(JMeterCommand.Settings setti
         public void Execute_Should_NotThrow(JMeterCommand sut, JMeterCommand.Settings settings)
         {
             settings.OutputPath = Directory.GetCurrentDirectory();
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
 
         [Theory, AutoMoqData]
@@ -41,7 +42,7 @@ public void Execute_Should_Create_Generator(
             JMeterCommand.Settings settings)
         {
             settings.OutputPath = Directory.GetCurrentDirectory();
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             Mock.Get(factory)
                 .Verify(c => c.Create(
@@ -65,7 +66,7 @@ public void Execute_Should_Write_To_IConsole(
 
             settings.OutputPath = path.FullName;
             settings.SkipLogging = false;
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             Mock.Get(factory)
                 .Verify(c => c.Create(
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/NSwagCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/NSwagCommandTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -41,7 +42,7 @@ public void Execute_Should_NotThrow(
                 .Setup(c => c.GenerateCode(progressReporter))
                 .Returns(code);
 
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
     }
 }
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/OpenApiCSharpGeneratorCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/OpenApiCSharpGeneratorCommandTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -42,7 +43,7 @@ public void Execute_Should_NotThrow(
                 .Setup(c => c.GenerateCode(progressReporter))
                 .Returns(code);
 
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
     }
 }
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/OpenApiGeneratorCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/OpenApiGeneratorCommandTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -30,7 +31,7 @@ public void OutputFile_Should_NotBeNullOrWhiteSpace(OpenApiGeneratorCommandSetti
         public void Execute_Should_NotThrow(OpenApiGeneratorCommand sut, OpenApiGeneratorCommandSettings settings)
         {
             settings.OutputPath = Directory.GetCurrentDirectory();
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
 
         [Theory, AutoMoqData]
@@ -40,7 +41,7 @@ public void Execute_Should_Create_Generator(
             OpenApiGeneratorCommandSettings settings)
         {
             settings.OutputPath = Directory.GetCurrentDirectory();
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             Mock.Get(factory)
                 .Verify(c => c.Create(
@@ -64,7 +65,7 @@ public void Execute_Should_Write_To_IConsole(
 
             settings.OutputPath = path.FullName;
             settings.SkipLogging = false;
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             Mock.Get(factory)
                 .Verify(c => c.Create(
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/RefitterCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/RefitterCommandTests.cs
@@ -8,6 +8,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
+using System.Threading;
 using Xunit;
 
 namespace Rapicgen.CLI.Tests.Command;
@@ -25,7 +26,7 @@ public void Should_Create_From_Factory(
     {
         // Ensure SettingsFile is null for this test
         settings.SettingsFile = null;
-        sut.Execute(null, settings);
+        sut.Execute(null, settings, CancellationToken.None);
         Mock.Get(factory)
             .Verify(f => f.Create(
                 settings.SwaggerFile,
@@ -49,7 +50,7 @@ public void Should_Create_From_Factory_With_Settings_File(
         try
         {
             settings.SettingsFile = tempFile;
-            sut.Execute(null, settings);
+            sut.Execute(null, settings, CancellationToken.None);
 
             // Verify that SwaggerFile was updated to match SettingsFile
             Assert.Equal(tempFile, settings.SwaggerFile);
diff --git a/src/CLI/ApiClientCodeGen.CLI.Tests/Command/SwaggerCodegenCommandTests.cs b/src/CLI/ApiClientCodeGen.CLI.Tests/Command/SwaggerCodegenCommandTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using ApiClientCodeGen.Tests.Common.Infrastructure;
 using AutoFixture.Xunit2;
 using Rapicgen.CLI.Commands;
@@ -41,7 +42,7 @@ public void Execute_Should_NotThrow(
                 .Setup(c => c.GenerateCode(progressReporter))
                 .Returns(code);
 
-            new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();
+            new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();
         }
     }
 }
diff --git a/src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj b/src/CLI/ApiClientCodeGen.CLI/ApiClientCodeGen.CLI.csproj
@@ -27,7 +27,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Spectre.Console.Cli" Version="0.52.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.53.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/CSharpCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/CSharpCommand.cs
@@ -1,4 +1,5 @@
 ﻿using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 using Spectre.Console.Cli;
 
 namespace Rapicgen.CLI.Commands.CSharp
@@ -10,7 +11,7 @@ public class Settings : CommandSettings
         {
         }
 
-        public override int Execute(CommandContext context, Settings settings)
+        public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken)
         {
             // This will be handled by subcommands
             return 0;
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/RefitterCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/RefitterCommand.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Threading;
 using Rapicgen.CLI.Commands;
 using Rapicgen.Core;
 using Rapicgen.Core.Generators;
@@ -72,7 +73,7 @@ public RefitterCommand(
         this.dependencyInstaller = dependencyInstaller;
     }
 
-    public override int Execute(CommandContext context, RefitterCommandSettings settings)
+    public override int Execute(CommandContext context, RefitterCommandSettings settings, CancellationToken cancellationToken)
     {
         // Map settings to options
         options.GenerateContracts = !settings.SkipGenerateContracts;
@@ -98,7 +99,7 @@ public override int Execute(CommandContext context, RefitterCommandSettings sett
         }
 
         // Call the base implementation
-        return base.Execute(context, settings);
+        return base.Execute(context, settings, cancellationToken);
     }
 
     public override ICodeGenerator CreateGenerator(RefitterCommandSettings settings) =>
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CodeGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CodeGeneratorCommand.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Threading;
 using Rapicgen.CLI.Extensions;
 using Rapicgen.Core;
 using Rapicgen.Core.Generators;
@@ -45,7 +46,7 @@ public string GetOutputFile()
             }
         }
 
-        public override int Execute(CommandContext context, T settings)
+        public override int Execute(CommandContext context, T settings, CancellationToken cancellationToken)
         {
             var codeGeneratorName = GetType().Name.Replace("Command", string.Empty);
             if (!settings.SkipLogging)
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/JMeterCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/JMeterCommand.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Threading;
 using Rapicgen.CLI.Extensions;
 using Rapicgen.Core;
 using Rapicgen.Core.Generators;
@@ -53,7 +54,7 @@ public JMeterCommand(
                 dependencyInstaller ?? throw new ArgumentNullException(nameof(dependencyInstaller));
         }
 
-        public override int Execute(CommandContext context, Settings settings)
+        public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken)
         {
             if (!settings.SkipLogging)
             {
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Threading;
 using Rapicgen.CLI.Extensions;
 using Rapicgen.Core;
 using Rapicgen.Core.Generators;
@@ -63,7 +64,7 @@ public OpenApiGeneratorCommand(
                 dependencyInstaller ?? throw new ArgumentNullException(nameof(dependencyInstaller));
         }
 
-        public override int Execute(CommandContext context, OpenApiGeneratorCommandSettings settings)
+        public override int Execute(CommandContext context, OpenApiGeneratorCommandSettings settings, CancellationToken cancellationToken)
         {
             var outputPath = settings.OutputPath ?? $"{settings.Generator}-generated-code";
 
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/TypeScriptCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/TypeScriptCommand.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Threading;
 using Rapicgen.CLI.Extensions;
 using Rapicgen.Core;
 using Rapicgen.Core.Generators;
@@ -59,7 +60,7 @@ public TypeScriptCommand(
                 dependencyInstaller ?? throw new ArgumentNullException(nameof(dependencyInstaller));
         }
 
-        public override int Execute(CommandContext context, Settings settings)
+        public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken)
         {
             if (!settings.SkipLogging)
             {
diff --git a/src/Output.cs b/src/Output.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Threading;`
`2`	`3`	`using ApiClientCodeGen.Tests.Common.Infrastructure;`
`3`	`4`	`using AutoFixture.Xunit2;`
`4`	`5`	`using Rapicgen.CLI.Commands;`
`@@ -41,7 +42,7 @@ public void Execute_Should_NotThrow(`
`41`	`42`	`.Setup(c => c.GenerateCode(progressReporter))`
`42`	`43`	`.Returns(code);`
`43`	`44`
`44`		`- new Func<int>(() => sut.Execute(null, settings)).Should().NotThrow();`
	`45`	`+ new Func<int>(() => sut.Execute(null, settings, CancellationToken.None)).Should().NotThrow();`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
	`2`	`+using System.Threading;`
`2`	`3`	`using Spectre.Console.Cli;`
`3`	`4`
`4`	`5`	`namespace Rapicgen.CLI.Commands.CSharp`
`@@ -10,7 +11,7 @@ public class Settings : CommandSettings`
`10`	`11`	`{`
`11`	`12`	`}`
`12`	`13`
`13`		`- public override int Execute(CommandContext context, Settings settings)`
	`14`	`+ public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken)`
`14`	`15`	`{`
`15`	`16`	`// This will be handled by subcommands`
`16`	`17`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.ComponentModel.DataAnnotations;`
`4`	`4`	`using System.Diagnostics.CodeAnalysis;`
`5`	`5`	`using System.IO;`
	`6`	`+using System.Threading;`
`6`	`7`	`using Rapicgen.CLI.Commands;`
`7`	`8`	`using Rapicgen.Core;`
`8`	`9`	`using Rapicgen.Core.Generators;`
`@@ -72,7 +73,7 @@ public RefitterCommand(`
`72`	`73`	`this.dependencyInstaller = dependencyInstaller;`
`73`	`74`	`}`
`74`	`75`
`75`		`- public override int Execute(CommandContext context, RefitterCommandSettings settings)`
	`76`	`+ public override int Execute(CommandContext context, RefitterCommandSettings settings, CancellationToken cancellationToken)`
`76`	`77`	`{`
`77`	`78`	`// Map settings to options`
`78`	`79`	`options.GenerateContracts = !settings.SkipGenerateContracts;`
`@@ -98,7 +99,7 @@ public override int Execute(CommandContext context, RefitterCommandSettings sett`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`// Call the base implementation`
`101`		`- return base.Execute(context, settings);`
	`102`	`+ return base.Execute(context, settings, cancellationToken);`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`public override ICodeGenerator CreateGenerator(RefitterCommandSettings settings) =>`