Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ internal sealed class CakeAppSettings : Spectre.Console.Cli.CommandSettings
[CommandOption("--info")]
[Description("Displays additional information about Cake.")]
public bool Info { get; set; }

[CommandOption("--no-report")]
[Description("Prevent the display of the summary report at the end of Cake Execution.")]
public bool NoReport { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ IServiceCollection services
services.AddSingleton(interceptor.CakeAppSettings);
services.AddSingleton<Spectre.Console.Cli.CommandSettings>(provider => provider.GetRequiredService<CakeAppSettings>());

var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.Targets);
var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.NoReport, interceptor.CakeAppSettings.Targets);
services.AddSingleton(arguments);
services.AddSingleton<ICakeArguments>(arguments);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static void PostScriptHost()
}
}

private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeReportPrinter reporter)
private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeConfiguration configuration, ICakeReportPrinter reporter)
: ScriptHost(engine, context)
{

Expand All @@ -59,13 +59,15 @@ public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targe

private async Task<CakeReport> internalRunTargetAsync()
{
bool noReportEnabled = false;
try
{
noReportEnabled = bool.TrueString.Equals(configuration.GetValue("Settings_NoReport") ?? bool.FalseString, StringComparison.OrdinalIgnoreCase);
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
if (report != null && !report.IsEmpty && !noReportEnabled)
{
reporter.Write(report);
}
Expand All @@ -76,7 +78,7 @@ private async Task<CakeReport> internalRunTargetAsync()
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
if (cre.Report != null && !cre.Report.IsEmpty && !noReportEnabled)
{
reporter.Write(cre.Report);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ internal sealed class CakeAppSettings : Spectre.Console.Cli.CommandSettings
[CommandOption("--info")]
[Description("Displays additional information about Cake.")]
public bool Info { get; set; }

[CommandOption("--no-report")]
[Description("Prevent the display of the summary report at the end of Cake Execution.")]
public bool NoReport { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ IServiceCollection services
services.AddSingleton(interceptor.CakeAppSettings);
services.AddSingleton<Spectre.Console.Cli.CommandSettings>(provider => provider.GetRequiredService<CakeAppSettings>());

var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.Targets);
var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.NoReport, interceptor.CakeAppSettings.Targets);
services.AddSingleton(arguments);
services.AddSingleton<ICakeArguments>(arguments);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private static void PostScriptHost()
}
}

private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeReportPrinter reporter)
private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeConfiguration configuration, ICakeReportPrinter reporter)
: ScriptHost(engine, context)
{

Expand All @@ -60,13 +60,15 @@ public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targe

private async Task<CakeReport> internalRunTargetAsync()
{
bool noReportEnabled = false;
try
{
noReportEnabled = bool.TrueString.Equals(configuration.GetValue("Settings_NoReport") ?? bool.FalseString, StringComparison.OrdinalIgnoreCase);
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
if (report != null && !report.IsEmpty && !noReportEnabled)
{
reporter.Write(report);
}
Expand All @@ -77,7 +79,7 @@ private async Task<CakeReport> internalRunTargetAsync()
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
if (cre.Report != null && !cre.Report.IsEmpty && !noReportEnabled)
{
reporter.Write(cre.Report);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,8 @@ internal sealed class CakeAppSettings : Spectre.Console.Cli.CommandSettings
[CommandOption("--info")]
[Description("Displays additional information about Cake.")]
public bool Info { get; set; }

[CommandOption("--no-report")]
[Description("Prevent the display of the summary report at the end of Cake Execution.")]
public bool NoReport { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ IServiceCollection services
services.AddSingleton(interceptor.CakeAppSettings);
services.AddSingleton<Spectre.Console.Cli.CommandSettings>(provider => provider.GetRequiredService<CakeAppSettings>());

var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.Targets);
var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.NoReport, interceptor.CakeAppSettings.Targets);
services.AddSingleton(arguments);
services.AddSingleton<ICakeArguments>(arguments);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static void PostScriptHost()
}
}

private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeReportPrinter reporter)
private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeConfiguration configuration, ICakeReportPrinter reporter)
: ScriptHost(engine, context)
{

Expand All @@ -59,13 +59,15 @@ public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targe

private async Task<CakeReport> internalRunTargetAsync()
{
bool noReportEnabled = false;
try
{
noReportEnabled = bool.TrueString.Equals(configuration.GetValue("Settings_NoReport") ?? bool.FalseString, StringComparison.OrdinalIgnoreCase);
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
if (report != null && !report.IsEmpty && !noReportEnabled)
{
reporter.Write(report);
}
Expand All @@ -76,7 +78,7 @@ private async Task<CakeReport> internalRunTargetAsync()
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
if (cre.Report != null && !cre.Report.IsEmpty && !noReportEnabled)
{
reporter.Write(cre.Report);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ internal sealed class CakeAppSettings : Spectre.Console.Cli.CommandSettings
[CommandOption("--info")]
[Description("Displays additional information about Cake.")]
public bool Info { get; set; }

[CommandOption("--no-report")]
[Description("Prevent the display of the summary report at the end of Cake Execution.")]
public bool NoReport { get; set; }
}
""";
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IServiceCollection services
services.AddSingleton(interceptor.CakeAppSettings);
services.AddSingleton<Spectre.Console.Cli.CommandSettings>(provider => provider.GetRequiredService<CakeAppSettings>());

var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.Targets);
var arguments = global::Cake.Cli.Infrastructure.IRemainingArgumentsExtensions.ToCakeArguments(ToUnQuotedRemainingArguments(interceptor.Context.Remaining), interceptor.CakeAppSettings.NoReport, interceptor.CakeAppSettings.Targets);
services.AddSingleton(arguments);
services.AddSingleton<ICakeArguments>(arguments);

Expand Down
8 changes: 5 additions & 3 deletions src/Cake.Generator.Core/CakeGenerator.Generate.ScriptHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private static void PostScriptHost()
}
}

private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeReportPrinter reporter)
private class GeneratorScriptHost(ICakeEngine engine, ICakeContext context, IExecutionStrategy strategy, ICakeConfiguration configuration, ICakeReportPrinter reporter)
: ScriptHost(engine, context)
{

Expand All @@ -89,13 +89,15 @@ public override async Task<CakeReport> RunTargetsAsync(IEnumerable<string> targe

private async Task<CakeReport> internalRunTargetAsync()
{
bool noReportEnabled = false;
try
{
noReportEnabled = bool.TrueString.Equals(configuration.GetValue("Settings_NoReport") ?? bool.FalseString, StringComparison.OrdinalIgnoreCase);
var report = await Engine
.RunTargetAsync(Context, strategy, Settings)
.ConfigureAwait(false);

if (report != null && !report.IsEmpty)
if (report != null && !report.IsEmpty && !noReportEnabled)
{
reporter.Write(report);
}
Expand All @@ -106,7 +108,7 @@ private async Task<CakeReport> internalRunTargetAsync()
}
catch (CakeReportException cre)
{
if (cre.Report != null && !cre.Report.IsEmpty)
if (cre.Report != null && !cre.Report.IsEmpty && !noReportEnabled)
{
reporter.Write(cre.Report);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.Generator.TestApp/Cake.Generator.TestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
Expand Down