Merge pull request #4640 from devlead/feature/gh-4638

devlead · web-flow · commit 43019421a4c4 · 2025-10-27T21:42:04.000+01:00
GH4638: Update Spectre.Console to 0.53.0
diff --git a/build.cake b/build.cake
@@ -416,7 +416,7 @@ Task("Run-Integration-Tests")
                 },
                 ArgumentCustomization = args => args
                     .AppendSwitchQuoted("--target", " ", Argument("integration-tests-target", "Run-All-Tests"))
-                    .AppendSwitchQuoted("--verbosity", " ", "quiet")
+                    .AppendSwitchQuoted("--verbosity", " ", Argument("integration-tests-verbosity", "quiet"))
                     .AppendSwitchQuoted("--platform", " ", parameters.IsRunningOnWindows ? "windows" : "posix")
                     .AppendSwitchQuoted("--customarg", " ", "hello")
                     .AppendSwitchQuoted("--multipleargs", "=", "a")
diff --git a/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs b/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs
@@ -24,7 +24,7 @@ public DefaultCommand(IServiceCollection services)
             _services = services ?? throw new ArgumentNullException(nameof(services));
         }
 
-        public override int Execute(CommandContext context, DefaultCommandSettings settings)
+        public override int Execute(CommandContext context, DefaultCommandSettings settings, System.Threading.CancellationToken cancellationToken)
         {
             // Register arguments
             var arguments = CreateCakeArguments(context.Remaining, settings);
diff --git a/src/Cake/Commands/DefaultCommand.cs b/src/Cake/Commands/DefaultCommand.cs
@@ -56,8 +56,9 @@ public DefaultCommand(
         /// </summary>
         /// <param name="context">The command context.</param>
         /// <param name="settings">The command settings.</param>
+        /// <param name="cancellationToken">The cancellation token to monitor for cancel requests.</param>
         /// <returns>The exit code.</returns>
-        public override int Execute(CommandContext context, DefaultCommandSettings settings)
+        public override int Execute(CommandContext context, DefaultCommandSettings settings, System.Threading.CancellationToken cancellationToken)
         {
             try
             {
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -27,8 +27,8 @@
     <PackageVersion Include="NuGet.Protocol" Version="6.14.0" />
     <PackageVersion Include="NuGet.Resolver" Version="6.14.0" />
     <PackageVersion Include="NuGet.Versioning" Version="6.14.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.52.0" />
-    <PackageVersion Include="Spectre.Console.Cli" Version="0.52.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.53.0" />
+    <PackageVersion Include="Spectre.Console.Cli" Version="0.53.0" />
     <PackageVersion Include="Spectre.Verify.Extensions" Version="28.16.0" />
     <PackageVersion Include="System.Collections.Immutable" Version="9.0.10" />
     <PackageVersion Include="System.Reflection.Metadata" Version="9.0.10" />
diff --git a/tests/integration/Cake.Core/Scripting/SpectreConsole.cake b/tests/integration/Cake.Core/Scripting/SpectreConsole.cake
@@ -3,7 +3,7 @@ using Spectre.Console;
 Task("Cake.Core.Scripting.Spectre.Console.FigletText")
     .Does(() =>
 {
-    AnsiConsole.Render(
+    AnsiConsole.Write(
         new FigletText("Cake")
             .LeftJustified()
             .Color(Color.Red));

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public DefaultCommand(IServiceCollection services)`
`24`	`24`	`_services = services ?? throw new ArgumentNullException(nameof(services));`
`25`	`25`	`}`
`26`	`26`
`27`		`- public override int Execute(CommandContext context, DefaultCommandSettings settings)`
	`27`	`+ public override int Execute(CommandContext context, DefaultCommandSettings settings, System.Threading.CancellationToken cancellationToken)`
`28`	`28`	`{`
`29`	`29`	`// Register arguments`
`30`	`30`	`var arguments = CreateCakeArguments(context.Remaining, settings);`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,9 @@ public DefaultCommand(`
`56`	`56`	`/// </summary>`
`57`	`57`	`/// <param name="context">The command context.</param>`
`58`	`58`	`/// <param name="settings">The command settings.</param>`
	`59`	`+ /// <param name="cancellationToken">The cancellation token to monitor for cancel requests.</param>`
`59`	`60`	`/// <returns>The exit code.</returns>`
`60`		`- public override int Execute(CommandContext context, DefaultCommandSettings settings)`
	`61`	`+ public override int Execute(CommandContext context, DefaultCommandSettings settings, System.Threading.CancellationToken cancellationToken)`
`61`	`62`	`{`
`62`	`63`	`try`
`63`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ using Spectre.Console;`
`3`	`3`	`Task("Cake.Core.Scripting.Spectre.Console.FigletText")`
`4`	`4`	`.Does(() =>`
`5`	`5`	`{`
`6`		`- AnsiConsole.Render(`
	`6`	`+ AnsiConsole.Write(`
`7`	`7`	`new FigletText("Cake")`
`8`	`8`	`.LeftJustified()`
`9`	`9`	`.Color(Color.Red));`