Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Spectre.Console.Cli.Tests/CommandAppTests.Constructor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public class NullableWithInitSettings : CommandSettings

public class NullableCommand : Command<NullableSettings>
{
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<NullableWithInitSettings>
{
protected override int Execute(CommandContext context, NullableWithInitSettings settings, CancellationToken cancellationToken) => 0;
public override int Execute(CommandContext context, NullableWithInitSettings settings, CancellationToken cancellationToken) => 0;
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public AsynchronousCommand(IAnsiConsole console)
_console = console;
}

protected override async Task<int> ExecuteAsync(CommandContext context, AsynchronousCommandSettings settings, CancellationToken cancellationToken)
public override async Task<int> ExecuteAsync(CommandContext context, AsynchronousCommandSettings settings, CancellationToken cancellationToken)
{
// Simulate a long running asynchronous task
await Task.Delay(200, cancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion src/Spectre.Console.Cli.Tests/Data/Commands/CatCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public class CatCommand : AnimalCommand<CatSettings>
{
protected override int Execute(CommandContext context, CatSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, CatSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Spectre.Console.Cli.Tests/Data/Commands/DogCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
[Description("The dog command.")]
public class DogCommand : AnimalCommand<DogSettings>
{
protected override ValidationResult Validate(CommandContext context, DogSettings settings)
public override ValidationResult Validate(CommandContext context, DogSettings settings)
{
if (context is null)
{
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public sealed class EmptyCommand : Command<EmptyCommandSettings>
{
protected override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
public sealed class GenericCommand<TSettings> : Command<TSettings>
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
[Description("The giraffe command.")]
public sealed class GiraffeCommand : Command<GiraffeSettings>
{
protected override int Execute(CommandContext context, GiraffeSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, GiraffeSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public sealed class HiddenOptionsCommand : Command<HiddenOptionSettings>
{
protected override int Execute(CommandContext context, HiddenOptionSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, HiddenOptionSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
[Description("The horse command.")]
public class HorseCommand : AnimalCommand<HorseSettings>
{
protected override int Execute(CommandContext context, HorseSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, HorseSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public sealed class InvalidCommand : Command<InvalidSettings>
{
protected override int Execute(CommandContext context, InvalidSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, InvalidSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Spectre.Console.Cli.Tests/Data/Commands/LionCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
[Description("The lion command.")]
public class LionCommand : AnimalCommand<LionSettings>
{
protected override int Execute(CommandContext context, LionSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, LionSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public sealed class NoDescriptionCommand : Command<EmptyCommandSettings>
[CommandOption("-f|--foo <VALUE>")]
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public class OptionVectorCommand : Command<OptionVectorSettings>
{
protected override int Execute(CommandContext context, OptionVectorSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, OptionVectorSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace Spectre.Console.Tests.Data;

public sealed class ThrowingCommand : Command<ThrowingCommandSettings>
{
protected override int Execute(CommandContext context, ThrowingCommandSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, ThrowingCommandSettings settings, CancellationToken cancellationToken)
{
throw new InvalidOperationException("W00t?");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Spectre.Console.Tests.Data;
[Description("The turtle command.")]
public class TurtleCommand : AnimalCommand<TurtleSettings>
{
protected override int Execute(CommandContext context, TurtleSettings settings, CancellationToken cancellationToken)
public override int Execute(CommandContext context, TurtleSettings settings, CancellationToken cancellationToken)
{
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}");

Expand Down
2 changes: 1 addition & 1 deletion src/Spectre.Console.Cli/AsyncCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public abstract class AsyncCommand : ICommand<EmptyCommandSettings>
/// <param name="context">The command context.</param>
/// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to abort the command.</param>
/// <returns>An integer indicating whether the command executed successfully.</returns>
protected abstract Task<int> ExecuteAsync(CommandContext context, CancellationToken cancellationToken);
public abstract Task<int> ExecuteAsync(CommandContext context, CancellationToken cancellationToken);

/// <inheritdoc/>
Task<int> ICommand<EmptyCommandSettings>.ExecuteAsync(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken)
Expand Down
4 changes: 2 additions & 2 deletions src/Spectre.Console.Cli/AsyncCommandOfT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public abstract class AsyncCommand<TSettings> : ICommand<TSettings>
/// <param name="context">The command context.</param>
/// <param name="settings">The settings.</param>
/// <returns>The validation result.</returns>
protected virtual ValidationResult Validate(CommandContext context, TSettings settings)
public virtual ValidationResult Validate(CommandContext context, TSettings settings)
{
return ValidationResult.Success();
}
Expand All @@ -25,7 +25,7 @@ protected virtual ValidationResult Validate(CommandContext context, TSettings se
/// <param name="settings">The settings.</param>
/// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to abort the command.</param>
/// <returns>An integer indicating whether or not the command executed successfully.</returns>
protected abstract Task<int> ExecuteAsync(CommandContext context, TSettings settings, CancellationToken cancellationToken);
public abstract Task<int> ExecuteAsync(CommandContext context, TSettings settings, CancellationToken cancellationToken);

/// <inheritdoc/>
ValidationResult ICommand.Validate(CommandContext context, CommandSettings settings)
Expand Down
2 changes: 1 addition & 1 deletion src/Spectre.Console.Cli/Command.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract class Command : ICommand<EmptyCommandSettings>
/// <param name="context">The command context.</param>
/// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to abort the command.</param>
/// <returns>An integer indicating whether the command executed successfully.</returns>
protected abstract int Execute(CommandContext context, CancellationToken cancellationToken);
public abstract int Execute(CommandContext context, CancellationToken cancellationToken);

/// <inheritdoc/>
Task<int> ICommand<EmptyCommandSettings>.ExecuteAsync(CommandContext context, EmptyCommandSettings settings, CancellationToken cancellationToken)
Expand Down
4 changes: 2 additions & 2 deletions src/Spectre.Console.Cli/CommandOfT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public abstract class Command<TSettings> : ICommand<TSettings>
/// <param name="context">The command context.</param>
/// <param name="settings">The settings.</param>
/// <returns>The validation result.</returns>
protected virtual ValidationResult Validate(CommandContext context, TSettings settings)
public virtual ValidationResult Validate(CommandContext context, TSettings settings)
{
return ValidationResult.Success();
}
Expand All @@ -26,7 +26,7 @@ protected virtual ValidationResult Validate(CommandContext context, TSettings se
/// <param name="settings">The settings.</param>
/// <param name="cancellationToken">A <see cref="CancellationToken"/> that can be used to abort the command.</param>
/// <returns>An integer indicating whether the command executed successfully.</returns>
protected abstract int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken);
public abstract int Execute(CommandContext context, TSettings settings, CancellationToken cancellationToken);

/// <inheritdoc/>
ValidationResult ICommand.Validate(CommandContext context, CommandSettings settings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}[/]",
Expand Down
2 changes: 1 addition & 1 deletion src/Spectre.Console.Cli/Internal/Commands/XmlDocCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down