Skip to content

Commit 6ec0d73

Browse files
committed
Bump version to 1.2.1.
1 parent d756187 commit 6ec0d73

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

Serilog.Sinks.MSBuild/MSBuildSink.cs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ namespace Serilog.Sinks.MSBuild
3030
/// <remarks>All are optional.</remarks>
3131
public static class MSBuildProperties
3232
{
33+
/// <summary>
34+
/// The message's subcategory.
35+
/// </summary>
36+
public static readonly string Subcategory = nameof(Subcategory);
37+
3338
/// <summary>
3439
/// The message's error code.
3540
/// </summary>
@@ -88,7 +93,7 @@ public MSBuildSink(ITask task, IFormatProvider formatProvider = null)
8893
/// <inheritdoc cref="ILogEventSink.Emit"/>
8994
public void Emit(LogEvent logEvent)
9095
{
91-
string GetPropertyOrNull(string key) =>
96+
string GetStringOrNull(string key) =>
9297
logEvent.Properties.TryGetValue(key, out var value) ? value.ToString() : null;
9398

9499
int GetIntOrZero(string key) =>
@@ -97,10 +102,10 @@ scalar.Value is int numValue
97102
? numValue
98103
: 0;
99104

100-
string subcategory = logEvent.MessageTemplate.Text;
101-
string code = GetPropertyOrNull(MessageCode);
102-
string helpKeyword = GetPropertyOrNull(HelpKeyword);
103-
string file = GetPropertyOrNull(File);
105+
string subcategory = GetStringOrNull(Subcategory);
106+
string code = GetStringOrNull(MessageCode);
107+
string helpKeyword = GetStringOrNull(HelpKeyword);
108+
string file = GetStringOrNull(File);
104109
int lineNumber = GetIntOrZero(LineNumber);
105110
int columnNumber = GetIntOrZero(ColumnNumber);
106111
int lineEndNumber = GetIntOrZero(EndLineNumber);
@@ -130,8 +135,7 @@ scalar.Value is int numValue
130135
case LogEventLevel.Fatal:
131136
case LogEventLevel.Error:
132137
if (logEvent.Level == LogEventLevel.Fatal)
133-
_loggingHelper.LogError("Fatal error", code, helpKeyword, file, lineNumber, columnNumber,
134-
lineEndNumber, columnEndNumber, "A fatal error did occur");
138+
subcategory = subcategory ?? "Fatal error";
135139
_loggingHelper.LogError(subcategory, code, helpKeyword, file, lineNumber, columnNumber,
136140
lineEndNumber, columnEndNumber, message);
137141
if (logEvent.Exception != null)

Serilog.Sinks.MSBuild/Serilog.Sinks.MSBuild.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Version>1.2.0</Version>
4+
<Version>1.2.1</Version>
55
<TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
66
<Title>Serilog sink for MSBuild</Title>
77
<Authors>Theodore Tsirpanis</Authors>
@@ -12,7 +12,7 @@
1212
It is useful when an MSBuild task calls code that uses Serilog.</Description>
1313
<PackageIconUrl>https://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/teo-tsirpanis/serilog-sinks-msbuild</PackageProjectUrl>
15-
<PackageReleaseNotes>Handle exceptions and fatal errors better.</PackageReleaseNotes>
15+
<PackageReleaseNotes>Allow the specification of the message subcategory.</PackageReleaseNotes>
1616
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1717
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1818
<EmbedUntrackedSources>true</EmbedUntrackedSources>

0 commit comments

Comments
 (0)