Merge pull request #14 from serilog/dev

2.1.2 Release
serilog · Mar 21, 2017 · 0d86412 · 0d86412
2 parents c4544d0 + 1a508bd
commit 0d86412
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git 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
+}
diff --git 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"
@@ -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
@@ -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": {}
   }
 }