From b8dcc9b6dbf59381f26ca95c662399371348f0ea Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Wed, 23 Nov 2016 07:42:14 +1000 Subject: [PATCH 1/2] Dev version bump [Skip CI] --- src/Serilog.Enrichers.Environment/project.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Serilog.Enrichers.Environment/project.json b/src/Serilog.Enrichers.Environment/project.json index 911e3a6..5248415 100644 --- a/src/Serilog.Enrichers.Environment/project.json +++ b/src/Serilog.Enrichers.Environment/project.json @@ -1,5 +1,5 @@ -{ - "version": "2.1.1-*", +{ + "version": "2.1.2-*", "description": "Enrich Serilog log events with properties from System.Environment.", "authors": [ "Serilog Contributors" From 6e00ceefbc388e09a6ce0241134f2897474eb902 Mon Sep 17 00:00:00 2001 From: Sergey Komisarchik Date: Tue, 21 Feb 2017 10:07:38 +0300 Subject: [PATCH 2/2] issue12 --- .../Enrichers/EnvironmentUserNameEnricher.cs | 6 +----- src/Serilog.Enrichers.Environment/project.json | 7 +++---- test/Serilog.Enrichers.Environment.Tests/project.json | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Serilog.Enrichers.Environment/Enrichers/EnvironmentUserNameEnricher.cs b/src/Serilog.Enrichers.Environment/Enrichers/EnvironmentUserNameEnricher.cs index 09ec040..98209d0 100644 --- a/src/Serilog.Enrichers.Environment/Enrichers/EnvironmentUserNameEnricher.cs +++ b/src/Serilog.Enrichers.Environment/Enrichers/EnvironmentUserNameEnricher.cs @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#if !DOTNET5_1 - using System; using Serilog.Core; using Serilog.Events; @@ -55,6 +53,4 @@ private static string GetEnvironmentUserName() return !string.IsNullOrWhiteSpace(userDomainName) ? $@"{userDomainName}\{userName}" : userName; } } -} - -#endif +} \ No newline at end of file diff --git a/src/Serilog.Enrichers.Environment/project.json b/src/Serilog.Enrichers.Environment/project.json index 5248415..9f6dc9f 100644 --- a/src/Serilog.Enrichers.Environment/project.json +++ b/src/Serilog.Enrichers.Environment/project.json @@ -23,12 +23,11 @@ }, "frameworks": { "net4.5": { - "define": ["ENV_USER_NAME"] + "buildOptions": { + "define": [ "ENV_USER_NAME" ] + } }, "netstandard1.3": { - "dependencies": { - "System.Runtime.Extensions": "4.1.0" - } } } } diff --git a/test/Serilog.Enrichers.Environment.Tests/project.json b/test/Serilog.Enrichers.Environment.Tests/project.json index f09cf60..1e809cf 100644 --- a/test/Serilog.Enrichers.Environment.Tests/project.json +++ b/test/Serilog.Enrichers.Environment.Tests/project.json @@ -11,7 +11,6 @@ "keyFile": "../../assets/Serilog.snk" }, "frameworks": { - "net4.6": { }, "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { @@ -23,6 +22,7 @@ "dnxcore50", "portable-net45+win8" ] - } + }, + "net4.6": {} } } \ No newline at end of file