diff --git a/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs b/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs index 2a7cde020c..86270924b1 100644 --- a/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs +++ b/src/Cake.Frosting/Internal/Commands/DefaultCommand.cs @@ -141,7 +141,7 @@ private IFrostingEngine GetFrostingEngine(ServiceProvider provider, DefaultComma { return provider.GetRequiredService(); } - else if (settings.Descriptions) + else if (settings.Description) { return provider.GetRequiredService(); } diff --git a/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs b/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs index 9e1f994170..0e13fc86f7 100644 --- a/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs +++ b/src/Cake.Frosting/Internal/Commands/DefaultCommandSettings.cs @@ -17,34 +17,34 @@ internal sealed class DefaultCommandSettings : CommandSettings [Description("Target task to invoke.")] public string Target { get; set; } - [CommandOption("-e|--exclusive")] - [Description("Executes the target task without any dependencies.")] - public bool Exclusive { get; set; } - [CommandOption("--working|-w ")] [TypeConverter(typeof(DirectoryPathConverter))] [Description("Sets the working directory")] public DirectoryPath WorkingDirectory { get; set; } [CommandOption("--verbosity|-v ")] + [Description("Specifies the amount of information to be displayed.\n(Quiet, Minimal, Normal, Verbose, Diagnostic)")] [TypeConverter(typeof(VerbosityConverter))] [DefaultValue(Verbosity.Normal)] - [Description("Specifies the amount of information to be displayed.\n(Quiet, Minimal, Normal, Verbose, Diagnostic)")] public Verbosity Verbosity { get; set; } - [CommandOption("--dryrun|--noop|--whatif")] - [Description("Performs a dry run.")] - public bool DryRun { get; set; } + [CommandOption("--description|--descriptions|--showdescription|--showdescriptions")] + [Description("Shows description for each task.")] + public bool Description { get; set; } - [CommandOption("--tree")] + [CommandOption("--tree|--showtree")] [Description("Shows the task dependency tree.")] public bool Tree { get; set; } - [CommandOption("--descriptions")] - [Description("Shows task descriptions.")] - public bool Descriptions { get; set; } + [CommandOption("--dryrun|--noop|--whatif")] + [Description("Performs a dry run.")] + public bool DryRun { get; set; } + + [CommandOption("--exclusive|-e")] + [Description("Executes the target task without any dependencies.")] + public bool Exclusive { get; set; } - [CommandOption("--version")] + [CommandOption("--version|--ver")] [Description("Displays version information.")] public bool Version { get; set; } diff --git a/src/Cake/Commands/DefaultCommand.cs b/src/Cake/Commands/DefaultCommand.cs index 0b1b045ca4..06bb5afb0c 100644 --- a/src/Cake/Commands/DefaultCommand.cs +++ b/src/Cake/Commands/DefaultCommand.cs @@ -115,11 +115,11 @@ private BuildHostKind GetBuildHostKind(DefaultCommandSettings settings) { return BuildHostKind.DryRun; } - else if (settings.ShowDescription) + else if (settings.Description) { return BuildHostKind.Description; } - else if (settings.ShowTree) + else if (settings.Tree) { return BuildHostKind.Tree; } diff --git a/src/Cake/Commands/DefaultCommandSettings.cs b/src/Cake/Commands/DefaultCommandSettings.cs index 6cc434ebc0..29d4e08f2b 100644 --- a/src/Cake/Commands/DefaultCommandSettings.cs +++ b/src/Cake/Commands/DefaultCommandSettings.cs @@ -18,24 +18,6 @@ public sealed class DefaultCommandSettings : CommandSettings [DefaultValue("build.cake")] public FilePath Script { get; set; } - [CommandOption("-v|--verbosity")] - [Description("Specifies the amount of information to be displayed.")] - [TypeConverter(typeof(VerbosityConverter))] - [DefaultValue(Verbosity.Normal)] - public Verbosity Verbosity { get; set; } - - [CommandOption("-d|--debug")] - [Description("Launches script in debug mode.")] - public bool Debug { get; set; } - - [CommandOption("-e|--exclusive")] - [Description("Executes the target task without any dependencies.")] - public bool Exclusive { get; set; } - - [CommandOption("--dryrun|--noop|--whatif")] - [Description("Performs a dry run.")] - public bool DryRun { get; set; } - [CommandOption("--bootstrap")] [Description("Download/install modules defined by [grey]#module[/] directives, but do not run build.")] public bool Bootstrap { get; set; } @@ -44,13 +26,31 @@ public sealed class DefaultCommandSettings : CommandSettings [Description("Skips bootstrapping when running build.")] public bool SkipBootstrap { get; set; } - [CommandOption("--description|--showdescription")] - [Description("Shows task descriptions.")] - public bool ShowDescription { get; set; } + [CommandOption("--debug|-d")] + [Description("Launches script in debug mode.")] + public bool Debug { get; set; } + + [CommandOption("--verbosity|-v ")] + [Description("Specifies the amount of information to be displayed.\n(Quiet, Minimal, Normal, Verbose, Diagnostic)")] + [TypeConverter(typeof(VerbosityConverter))] + [DefaultValue(Verbosity.Normal)] + public Verbosity Verbosity { get; set; } + + [CommandOption("--description|--descriptions|--showdescription|--showdescriptions")] + [Description("Shows description for each task.")] + public bool Description { get; set; } [CommandOption("--tree|--showtree")] [Description("Shows the task dependency tree.")] - public bool ShowTree { get; set; } + public bool Tree { get; set; } + + [CommandOption("--dryrun|--noop|--whatif")] + [Description("Performs a dry run.")] + public bool DryRun { get; set; } + + [CommandOption("--exclusive|-e")] + [Description("Executes the target task without any dependencies.")] + public bool Exclusive { get; set; } [CommandOption("--version|--ver")] [Description("Displays version information.")]