diff --git a/src/Spectre.Console.Cli.Tests/CommandAppTests.Constructor.cs b/src/Spectre.Console.Cli.Tests/CommandAppTests.Constructor.cs index e7722c5..eab42f4 100644 --- a/src/Spectre.Console.Cli.Tests/CommandAppTests.Constructor.cs +++ b/src/Spectre.Console.Cli.Tests/CommandAppTests.Constructor.cs @@ -28,12 +28,12 @@ public class NullableWithInitSettings : CommandSettings public class NullableCommand : Command { - protected override int Execute(CommandContext context, NullableSettings settings, CancellationToken cancellationToken) => 0; + public override int Execute(CommandContext context, NullableSettings settings, CancellationToken cancellationToken) => 0; } public class NullableWithInitCommand : Command { - protected override int Execute(CommandContext context, NullableWithInitSettings settings, CancellationToken cancellationToken) => 0; + public override int Execute(CommandContext context, NullableWithInitSettings settings, CancellationToken cancellationToken) => 0; } [Fact] diff --git a/src/Spectre.Console.Cli.Tests/CommandAppTests.Injection.Settings.cs b/src/Spectre.Console.Cli.Tests/CommandAppTests.Injection.Settings.cs index 5353db8..9ab0cb9 100644 --- a/src/Spectre.Console.Cli.Tests/CommandAppTests.Injection.Settings.cs +++ b/src/Spectre.Console.Cli.Tests/CommandAppTests.Injection.Settings.cs @@ -19,7 +19,7 @@ public CustomInheritedCommand(SomeFakeDependency dep) _dep = dep; } - protected override int Execute(CommandContext context, CustomInheritedCommandSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, CustomInheritedCommandSettings settings, CancellationToken cancellationToken) { return _dep.GetExitCode(); } diff --git a/src/Spectre.Console.Cli.Tests/CommandAppTests.Interceptor.cs b/src/Spectre.Console.Cli.Tests/CommandAppTests.Interceptor.cs index 1e8d4dd..13ad0b9 100644 --- a/src/Spectre.Console.Cli.Tests/CommandAppTests.Interceptor.cs +++ b/src/Spectre.Console.Cli.Tests/CommandAppTests.Interceptor.cs @@ -10,7 +10,7 @@ public sealed class Settings : CommandSettings { } - protected override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/AsynchronousCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/AsynchronousCommand.cs index 0935c78..8c28945 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/AsynchronousCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/AsynchronousCommand.cs @@ -9,7 +9,7 @@ public AsynchronousCommand(IAnsiConsole console) _console = console; } - protected override async Task ExecuteAsync(CommandContext context, AsynchronousCommandSettings settings, CancellationToken cancellationToken) + public override async Task ExecuteAsync(CommandContext context, AsynchronousCommandSettings settings, CancellationToken cancellationToken) { // Simulate a long running asynchronous task await Task.Delay(200, cancellationToken); diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/CatCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/CatCommand.cs index bdc446f..7a30a97 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/CatCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/CatCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public class CatCommand : AnimalCommand { - protected override int Execute(CommandContext context, CatSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, CatSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/DogCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/DogCommand.cs index 10fdb83..a3818f4 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/DogCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/DogCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; [Description("The dog command.")] public class DogCommand : AnimalCommand { - protected override ValidationResult Validate(CommandContext context, DogSettings settings) + public override ValidationResult Validate(CommandContext context, DogSettings settings) { if (context is null) { @@ -23,7 +23,7 @@ protected override ValidationResult Validate(CommandContext context, DogSettings return base.Validate(context, settings); } - protected override int Execute(CommandContext context, DogSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, DogSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/DumpRemainingCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/DumpRemainingCommand.cs index 8770823..7523a0e 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/DumpRemainingCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/DumpRemainingCommand.cs @@ -9,7 +9,7 @@ public DumpRemainingCommand(IAnsiConsole console) _console = console; } - protected override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) { if (context.Remaining.Raw.Count > 0) { diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/EmptyCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/EmptyCommand.cs index 1508b1f..8b322ab 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/EmptyCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/EmptyCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public sealed class EmptyCommand : Command { - protected override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/GenericCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/GenericCommand.cs index 021e32a..5a562b6 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/GenericCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/GenericCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; public sealed class GenericCommand : Command where TSettings : CommandSettings { - protected override int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/GiraffeCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/GiraffeCommand.cs index 69171c4..b021360 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/GiraffeCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/GiraffeCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; [Description("The giraffe command.")] public sealed class GiraffeCommand : Command { - protected override int Execute(CommandContext context, GiraffeSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, GiraffeSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/GreeterCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/GreeterCommand.cs index ec25955..a016dd9 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/GreeterCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/GreeterCommand.cs @@ -9,7 +9,7 @@ public GreeterCommand(IAnsiConsole console) _console = console; } - protected override int Execute(CommandContext context, OptionalArgumentWithDefaultValueSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, OptionalArgumentWithDefaultValueSettings settings, CancellationToken cancellationToken) { _console.WriteLine(settings.Greeting ?? string.Empty); return 0; diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/HiddenOptionsCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/HiddenOptionsCommand.cs index d0225b1..8e2a051 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/HiddenOptionsCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/HiddenOptionsCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public sealed class HiddenOptionsCommand : Command { - protected override int Execute(CommandContext context, HiddenOptionSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, HiddenOptionSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/HorseCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/HorseCommand.cs index 59f479c..09cf956 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/HorseCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/HorseCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; [Description("The horse command.")] public class HorseCommand : AnimalCommand { - protected override int Execute(CommandContext context, HorseSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, HorseSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/InvalidCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/InvalidCommand.cs index 600c42d..2432843 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/InvalidCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/InvalidCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public sealed class InvalidCommand : Command { - protected override int Execute(CommandContext context, InvalidSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, InvalidSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/LionCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/LionCommand.cs index a520b29..7ee8527 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/LionCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/LionCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; [Description("The lion command.")] public class LionCommand : AnimalCommand { - protected override int Execute(CommandContext context, LionSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, LionSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/NoDescriptionCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/NoDescriptionCommand.cs index ff93e3c..52f2e19 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/NoDescriptionCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/NoDescriptionCommand.cs @@ -5,7 +5,7 @@ public sealed class NoDescriptionCommand : Command [CommandOption("-f|--foo ")] public int Foo { get; set; } - protected override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/OptionVectorCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/OptionVectorCommand.cs index 30c8166..5ef023a 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/OptionVectorCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/OptionVectorCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public class OptionVectorCommand : Command { - protected override int Execute(CommandContext context, OptionVectorSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, OptionVectorSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/ThrowingCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/ThrowingCommand.cs index 2f70729..493c3f1 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/ThrowingCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/ThrowingCommand.cs @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data; public sealed class ThrowingCommand : Command { - protected override int Execute(CommandContext context, ThrowingCommandSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, ThrowingCommandSettings settings, CancellationToken cancellationToken) { throw new InvalidOperationException("W00t?"); } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/TurtleCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/TurtleCommand.cs index d3160c4..8885c3a 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/TurtleCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/TurtleCommand.cs @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data; [Description("The turtle command.")] public class TurtleCommand : AnimalCommand { - protected override int Execute(CommandContext context, TurtleSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, TurtleSettings settings, CancellationToken cancellationToken) { return 0; } diff --git a/src/Spectre.Console.Cli.Tests/Data/Commands/VersionCommand.cs b/src/Spectre.Console.Cli.Tests/Data/Commands/VersionCommand.cs index 39dac00..08b8ab9 100644 --- a/src/Spectre.Console.Cli.Tests/Data/Commands/VersionCommand.cs +++ b/src/Spectre.Console.Cli.Tests/Data/Commands/VersionCommand.cs @@ -9,7 +9,7 @@ public VersionCommand(IAnsiConsole console) _console = console; } - protected override int Execute(CommandContext context, VersionSettings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, VersionSettings settings, CancellationToken cancellationToken) { _console.WriteLine($"VersionCommand ran, Version: {settings.Version ?? string.Empty}"); diff --git a/src/Spectre.Console.Cli/AsyncCommand.cs b/src/Spectre.Console.Cli/AsyncCommand.cs index 27de355..ca2816a 100644 --- a/src/Spectre.Console.Cli/AsyncCommand.cs +++ b/src/Spectre.Console.Cli/AsyncCommand.cs @@ -11,7 +11,7 @@ public abstract class AsyncCommand : ICommand /// The command context. /// A that can be used to abort the command. /// An integer indicating whether the command executed successfully. - protected abstract Task ExecuteAsync(CommandContext context, CancellationToken cancellationToken); + public abstract Task ExecuteAsync(CommandContext context, CancellationToken cancellationToken); /// Task ICommand.ExecuteAsync(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) diff --git a/src/Spectre.Console.Cli/AsyncCommandOfT.cs b/src/Spectre.Console.Cli/AsyncCommandOfT.cs index ee5feb5..5172b68 100644 --- a/src/Spectre.Console.Cli/AsyncCommandOfT.cs +++ b/src/Spectre.Console.Cli/AsyncCommandOfT.cs @@ -13,7 +13,7 @@ public abstract class AsyncCommand : ICommand /// The command context. /// The settings. /// The validation result. - protected virtual ValidationResult Validate(CommandContext context, TSettings settings) + public virtual ValidationResult Validate(CommandContext context, TSettings settings) { return ValidationResult.Success(); } @@ -25,7 +25,7 @@ protected virtual ValidationResult Validate(CommandContext context, TSettings se /// The settings. /// A that can be used to abort the command. /// An integer indicating whether or not the command executed successfully. - protected abstract Task ExecuteAsync(CommandContext context, TSettings settings, CancellationToken cancellationToken); + public abstract Task ExecuteAsync(CommandContext context, TSettings settings, CancellationToken cancellationToken); /// ValidationResult ICommand.Validate(CommandContext context, CommandSettings settings) diff --git a/src/Spectre.Console.Cli/Command.cs b/src/Spectre.Console.Cli/Command.cs index 03dad7c..33b1dde 100644 --- a/src/Spectre.Console.Cli/Command.cs +++ b/src/Spectre.Console.Cli/Command.cs @@ -12,7 +12,7 @@ public abstract class Command : ICommand /// The command context. /// A that can be used to abort the command. /// An integer indicating whether the command executed successfully. - protected abstract int Execute(CommandContext context, CancellationToken cancellationToken); + public abstract int Execute(CommandContext context, CancellationToken cancellationToken); /// Task ICommand.ExecuteAsync(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken) diff --git a/src/Spectre.Console.Cli/CommandOfT.cs b/src/Spectre.Console.Cli/CommandOfT.cs index 45a58ed..7c7f380 100644 --- a/src/Spectre.Console.Cli/CommandOfT.cs +++ b/src/Spectre.Console.Cli/CommandOfT.cs @@ -14,7 +14,7 @@ public abstract class Command : ICommand /// The command context. /// The settings. /// The validation result. - protected virtual ValidationResult Validate(CommandContext context, TSettings settings) + public virtual ValidationResult Validate(CommandContext context, TSettings settings) { return ValidationResult.Success(); } @@ -26,7 +26,7 @@ protected virtual ValidationResult Validate(CommandContext context, TSettings se /// The settings. /// A that can be used to abort the command. /// An integer indicating whether the command executed successfully. - protected abstract int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken); + public abstract int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken); /// ValidationResult ICommand.Validate(CommandContext context, CommandSettings settings) diff --git a/src/Spectre.Console.Cli/Internal/Commands/ExplainCommand.cs b/src/Spectre.Console.Cli/Internal/Commands/ExplainCommand.cs index 6fcb66b..0b22300 100644 --- a/src/Spectre.Console.Cli/Internal/Commands/ExplainCommand.cs +++ b/src/Spectre.Console.Cli/Internal/Commands/ExplainCommand.cs @@ -27,7 +27,7 @@ public sealed class Settings : CommandSettings public bool IncludeHidden { get; set; } } - protected override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) + public override int Execute(CommandContext context, Settings settings, CancellationToken cancellationToken) { var tree = new Tree("CLI Configuration"); tree.AddNode(ValueMarkup("Application Name", _commandModel.ApplicationName, "no application name")); diff --git a/src/Spectre.Console.Cli/Internal/Commands/OpenCliGeneratorCommand.cs b/src/Spectre.Console.Cli/Internal/Commands/OpenCliGeneratorCommand.cs index 0566907..0f9417b 100644 --- a/src/Spectre.Console.Cli/Internal/Commands/OpenCliGeneratorCommand.cs +++ b/src/Spectre.Console.Cli/Internal/Commands/OpenCliGeneratorCommand.cs @@ -13,7 +13,7 @@ public OpenCliGeneratorCommand(IConfiguration configuration, CommandModel model) _model = model ?? throw new ArgumentNullException(nameof(model)); } - protected override int Execute(CommandContext context, CancellationToken cancellationToken) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { var document = new OpenCliDocument { diff --git a/src/Spectre.Console.Cli/Internal/Commands/VersionCommand.cs b/src/Spectre.Console.Cli/Internal/Commands/VersionCommand.cs index 25250d6..04cdd6a 100644 --- a/src/Spectre.Console.Cli/Internal/Commands/VersionCommand.cs +++ b/src/Spectre.Console.Cli/Internal/Commands/VersionCommand.cs @@ -11,7 +11,7 @@ public VersionCommand(IConfiguration configuration) _writer = configuration.Settings.Console.GetConsole(); } - protected override int Execute(CommandContext context, CancellationToken cancellationToken) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { _writer.MarkupLine( "[yellow]Spectre.Console.Cli[/] version [aqua]{0}[/]", diff --git a/src/Spectre.Console.Cli/Internal/Commands/XmlDocCommand.cs b/src/Spectre.Console.Cli/Internal/Commands/XmlDocCommand.cs index 94b52d9..704983c 100644 --- a/src/Spectre.Console.Cli/Internal/Commands/XmlDocCommand.cs +++ b/src/Spectre.Console.Cli/Internal/Commands/XmlDocCommand.cs @@ -13,7 +13,7 @@ public XmlDocCommand(IConfiguration configuration, CommandModel model) _writer = configuration.Settings.Console.GetConsole(); } - protected override int Execute(CommandContext context, CancellationToken cancellationToken) + public override int Execute(CommandContext context, CancellationToken cancellationToken) { _writer.Write(Serialize(_model), Style.Plain); return 0;