From 62b894125e34c4ba2041bfe68a5071488ff8e889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Luthi?= Date: Mon, 27 Oct 2025 21:21:40 +0100 Subject: [PATCH] Update examples to Spectre.Console.* version 0.53.0 All the Cli examples have been updated with the new CancellationToken introduced in https://github.com/spectreconsole/spectre.console/pull/1911 --- examples/Cli/Delegates/Program.cs | 9 +++++---- examples/Cli/Demo/Commands/Add/AddPackageCommand.cs | 3 ++- examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs | 3 ++- examples/Cli/Demo/Commands/Run/RunCommand.cs | 3 ++- examples/Cli/Demo/Commands/Serve/ServeCommand.cs | 3 ++- examples/Cli/Dynamic/MyCommand.cs | 3 ++- examples/Cli/Help/DefaultCommand.cs | 2 +- examples/Cli/Injection/Commands/DefaultCommand.cs | 3 ++- examples/Cli/Logging/Commands/HelloCommand.cs | 3 ++- examples/Cli/Testing/CommandAppTests.cs | 2 +- examples/Shared/Shared.csproj | 10 +++++----- 11 files changed, 26 insertions(+), 18 deletions(-) diff --git a/examples/Cli/Delegates/Program.cs b/examples/Cli/Delegates/Program.cs index a91df34..ecc3087 100644 --- a/examples/Cli/Delegates/Program.cs +++ b/examples/Cli/Delegates/Program.cs @@ -1,3 +1,4 @@ +using System.Threading; using System.Threading.Tasks; using Spectre.Console; using Spectre.Console.Cli; @@ -27,13 +28,13 @@ public static int Main(string[] args) return app.Run(args); } - private static int Foo(CommandContext context) + private static int Foo(CommandContext context, CancellationToken cancellationToken) { AnsiConsole.WriteLine("Foo"); return 0; } - private static int Bar(CommandContext context, BarSettings settings) + private static int Bar(CommandContext context, BarSettings settings, CancellationToken cancellationToken) { for (var index = 0; index < settings.Count; index++) { @@ -43,13 +44,13 @@ private static int Bar(CommandContext context, BarSettings settings) return 0; } - private static Task FooAsync(CommandContext context) + private static Task FooAsync(CommandContext context, CancellationToken cancellationToken) { AnsiConsole.WriteLine("Foo"); return Task.FromResult(0); } - private static Task BarAsync(CommandContext context, BarSettings settings) + private static Task BarAsync(CommandContext context, BarSettings settings, CancellationToken cancellationToken) { for (var index = 0; index < settings.Count; index++) { diff --git a/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs b/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs index 1166d08..4701fd4 100644 --- a/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs +++ b/examples/Cli/Demo/Commands/Add/AddPackageCommand.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using System.Threading; using Demo.Utilities; using Spectre.Console.Cli; @@ -38,7 +39,7 @@ public sealed class Settings : AddSettings public bool Interactive { get; set; } } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { SettingsDumper.Dump(settings); return 0; diff --git a/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs b/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs index 33e2b8a..2a8adc2 100644 --- a/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs +++ b/examples/Cli/Demo/Commands/Add/AddReferenceCommand.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using System.Threading; using Demo.Utilities; using Spectre.Console.Cli; @@ -21,7 +22,7 @@ public sealed class Settings : AddSettings public bool Interactive { get; set; } } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { SettingsDumper.Dump(settings); return 0; diff --git a/examples/Cli/Demo/Commands/Run/RunCommand.cs b/examples/Cli/Demo/Commands/Run/RunCommand.cs index a1aa675..0843a1b 100644 --- a/examples/Cli/Demo/Commands/Run/RunCommand.cs +++ b/examples/Cli/Demo/Commands/Run/RunCommand.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using System.Threading; using Demo.Utilities; using Spectre.Console.Cli; @@ -61,7 +62,7 @@ public sealed class Settings : CommandSettings public bool Force { get; set; } } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { SettingsDumper.Dump(settings); return 0; diff --git a/examples/Cli/Demo/Commands/Serve/ServeCommand.cs b/examples/Cli/Demo/Commands/Serve/ServeCommand.cs index 58d1271..aaf0509 100644 --- a/examples/Cli/Demo/Commands/Serve/ServeCommand.cs +++ b/examples/Cli/Demo/Commands/Serve/ServeCommand.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Threading; using Demo.Utilities; using Spectre.Console.Cli; @@ -19,7 +20,7 @@ public sealed class Settings : CommandSettings public FlagValue OpenBrowser { get; set; } } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { if (settings.OpenBrowser.IsSet) { diff --git a/examples/Cli/Dynamic/MyCommand.cs b/examples/Cli/Dynamic/MyCommand.cs index 60128cb..ac24a4f 100644 --- a/examples/Cli/Dynamic/MyCommand.cs +++ b/examples/Cli/Dynamic/MyCommand.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; using Spectre.Console; using Spectre.Console.Cli; @@ -6,7 +7,7 @@ namespace Dynamic; public sealed class MyCommand : Command { - public override int Execute(CommandContext context) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { if (!(context.Data is int data)) { diff --git a/examples/Cli/Help/DefaultCommand.cs b/examples/Cli/Help/DefaultCommand.cs index 71613d0..85f274b 100644 --- a/examples/Cli/Help/DefaultCommand.cs +++ b/examples/Cli/Help/DefaultCommand.cs @@ -12,7 +12,7 @@ public DefaultCommand(IAnsiConsole console) _console = console; } - public override int Execute(CommandContext context) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { _console.WriteLine("Hello world"); return 0; diff --git a/examples/Cli/Injection/Commands/DefaultCommand.cs b/examples/Cli/Injection/Commands/DefaultCommand.cs index b31cc8a..a917a00 100644 --- a/examples/Cli/Injection/Commands/DefaultCommand.cs +++ b/examples/Cli/Injection/Commands/DefaultCommand.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Threading; using Spectre.Console.Cli; namespace Injection.Commands; @@ -21,7 +22,7 @@ public DefaultCommand(IGreeter greeter) _greeter = greeter ?? throw new ArgumentNullException(nameof(greeter)); } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { _greeter.Greet(settings.Name); return 0; diff --git a/examples/Cli/Logging/Commands/HelloCommand.cs b/examples/Cli/Logging/Commands/HelloCommand.cs index 21e8244..f6bec7f 100644 --- a/examples/Cli/Logging/Commands/HelloCommand.cs +++ b/examples/Cli/Logging/Commands/HelloCommand.cs @@ -1,3 +1,4 @@ +using System.Threading; using Microsoft.Extensions.Logging; using Spectre.Console; using Spectre.Console.Cli; @@ -23,7 +24,7 @@ public class Settings : LogCommandSettings } - public override int Execute(CommandContext context, Settings settings) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { _logger.LogInformation("Starting my command"); AnsiConsole.MarkupLine($"Hello, [blue]{settings.Name}[/]"); diff --git a/examples/Cli/Testing/CommandAppTests.cs b/examples/Cli/Testing/CommandAppTests.cs index 27612bb..ebbbf75 100644 --- a/examples/Cli/Testing/CommandAppTests.cs +++ b/examples/Cli/Testing/CommandAppTests.cs @@ -23,7 +23,7 @@ public HelloWorldCommand(IAnsiConsole console) _console = console; } - public override int Execute(CommandContext context) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { _console.WriteLine("Hello world."); return 0; diff --git a/examples/Shared/Shared.csproj b/examples/Shared/Shared.csproj index d5cc440..767ec35 100644 --- a/examples/Shared/Shared.csproj +++ b/examples/Shared/Shared.csproj @@ -7,11 +7,11 @@ - - - - - + + + + +