Skip to content

Commit 0d86412

Browse files
authored
Merge pull request #14 from serilog/dev
2.1.2 Release
2 parents c4544d0 + 1a508bd commit 0d86412

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

Diff for: src/Serilog.Enrichers.Environment/Enrichers/EnvironmentUserNameEnricher.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#if !DOTNET5_1
16-
1715
using System;
1816
using Serilog.Core;
1917
using Serilog.Events;
@@ -55,6 +53,4 @@ private static string GetEnvironmentUserName()
5553
return !string.IsNullOrWhiteSpace(userDomainName) ? $@"{userDomainName}\{userName}" : userName;
5654
}
5755
}
58-
}
59-
60-
#endif
56+
}

Diff for: src/Serilog.Enrichers.Environment/project.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"version": "2.1.1-*",
1+
{
2+
"version": "2.1.2-*",
33
"description": "Enrich Serilog log events with properties from System.Environment.",
44
"authors": [
55
"Serilog Contributors"
@@ -23,12 +23,11 @@
2323
},
2424
"frameworks": {
2525
"net4.5": {
26-
"define": ["ENV_USER_NAME"]
26+
"buildOptions": {
27+
"define": [ "ENV_USER_NAME" ]
28+
}
2729
},
2830
"netstandard1.3": {
29-
"dependencies": {
30-
"System.Runtime.Extensions": "4.1.0"
31-
}
3231
}
3332
}
3433
}

Diff for: test/Serilog.Enrichers.Environment.Tests/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"keyFile": "../../assets/Serilog.snk"
1212
},
1313
"frameworks": {
14-
"net4.6": { },
1514
"netcoreapp1.0": {
1615
"dependencies": {
1716
"Microsoft.NETCore.App": {
@@ -23,6 +22,7 @@
2322
"dnxcore50",
2423
"portable-net45+win8"
2524
]
26-
}
25+
},
26+
"net4.6": {}
2727
}
2828
}

0 commit comments

Comments
 (0)