Fixing up framework specifiers and adding support for .Net Standard 1.0

ite-klass · Feb 9, 2016 · 2fd3810 · 2fd3810
1 parent f036e16
commit 2fd3810
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/Serilog.Sinks.Console/project.json b/src/Serilog.Sinks.Console/project.json
@@ -15,7 +15,7 @@
   "frameworks": {
     "net45": {
     },
-    "dotnet5.1": {
+    "dotnet5.3": {
       "dependencies": {
         "System.Console": "4.0.0-beta-23516"
       }

diff --git a/src/Serilog/Context/LogContext.cs b/src/Serilog/Context/LogContext.cs
@@ -59,8 +59,13 @@ public static class LogContext
     {
 #if ASYNCLOCAL
         static readonly AsyncLocal<ImmutableStack<ILogEventEnricher>> Data = new AsyncLocal<ImmutableStack<ILogEventEnricher>>();
+#else
+#if DOTNET5_1
+        [ThreadStatic]
+        static ImmutableStack<ILogEventEnricher> Data;
 #else
         static readonly string DataSlotName = typeof(LogContext).FullName;
+#endif
 #endif
 
         /// <summary>
@@ -151,6 +156,21 @@ static ImmutableStack<ILogEventEnricher> Enrichers
                 Data.Value = GetContext(value);
             }
         }
+#else
+
+#if DOTNET5_1
+       static ImmutableStack<ILogEventEnricher> Enrichers
+        {
+            get
+            {
+                return Data;
+            }
+            set
+            {
+                Data = GetContext(value);
+            }
+        }
+
 #else
         static ImmutableStack<ILogEventEnricher> Enrichers
         {
@@ -180,6 +200,7 @@ static ImmutableStack<ILogEventEnricher> Enrichers
             }
         }
 #endif
+#endif
 
 #if REMOTING
         /// <summary>

diff --git a/src/Serilog/project.json b/src/Serilog/project.json
@@ -19,7 +19,7 @@
         "dotnet5.1": {
             "compilationOptions": {
                 "keyFile": "../../assets/Serilog.snk",
-                "define": [ "NO_APPDOMAIN" ]
+                "define": [ "NO_APPDOMAIN", "LOGCONTEXT" ]
             },
             "dependencies": {
                 "Microsoft.CSharp": "4.0.1-beta-23516",