Skip to content

Commit

Permalink
Merge branch 'hotfix/6.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Aug 18, 2022
2 parents fa8aae5 + 2d179e7 commit 39132f3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [vNext]

## [6.2.1] / 2022-08-19
- Fixed logging configuration

## [6.2.0] / 2022-08-19
- Added support for intercepted targets
- Added target interception for Docker
Expand Down Expand Up @@ -968,7 +971,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added CLT tasks for Git
- Fixed background color in console output

[vNext]: https://github.com/nuke-build/nuke/compare/6.2.0...HEAD
[vNext]: https://github.com/nuke-build/nuke/compare/6.2.1...HEAD
[6.2.1]: https://github.com/nuke-build/nuke/compare/6.2.0...6.2.1
[6.2.0]: https://github.com/nuke-build/nuke/compare/6.1.2...6.2.0
[6.1.2]: https://github.com/nuke-build/nuke/compare/6.1.1...6.1.2
[6.1.1]: https://github.com/nuke-build/nuke/compare/6.1.0...6.1.1
Expand Down Expand Up @@ -1060,4 +1064,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
[0.3.1]: https://github.com/nuke-build/nuke/compare/0.2.10...0.3.1
[0.2.10]: https://github.com/nuke-build/nuke/compare/0.2.0...0.2.10
[0.2.0]: https://github.com/nuke-build/nuke/tree/0.2.0

16 changes: 9 additions & 7 deletions source/Nuke.Common/Execution/Logging.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,18 @@ public static LogLevel Level

public static void Configure(NukeBuild build = null)
{
if (NukeBuild.IsInterceptorExecution)
if (build != null)
{
Log.Logger = new LoggerConfiguration()
.WriteTo.Console(new CompactJsonFormatter())
.CreateLogger();
return;
}
if (NukeBuild.IsInterceptorExecution)
{
Log.Logger = new LoggerConfiguration()
.WriteTo.Console(new CompactJsonFormatter())
.CreateLogger();
return;
}

if (build != null)
DeleteOldLogFiles();
}

Log.Logger = new LoggerConfiguration()
.Enrich.With<ExecutingTargetLogEventEnricher>()
Expand Down

0 comments on commit 39132f3

Please sign in to comment.