Merge pull request #32 from nblumhardt/dev

Re-enable .NET 4.5.1 target

Author: merbla

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs

@@ -3,7 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+#if ASYNCLOCAL
 using System.Threading;
+#else
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+#endif
 using Microsoft.Extensions.Logging;
 using Serilog.Core;
 using Serilog.Events;
@@ -15,8 +20,6 @@ class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher
     {
         public const string OriginalFormatPropertyName = "{OriginalFormat}";
 
-        readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
-
         // May be null; if it is, Log.Logger will be lazily used
         readonly ILogger _logger;
 
@@ -55,6 +58,9 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
             }
         }
 
+#if ASYNCLOCAL
+        readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
+
         public SerilogLoggerScope CurrentScope
         {
             get
@@ -66,6 +72,22 @@ public SerilogLoggerScope CurrentScope
                 _value.Value = value;
             }
         }
+#else
+        readonly string _currentScopeKey = nameof(SerilogLoggerScope) + "#" + Guid.NewGuid().ToString("n");
+
+        public SerilogLoggerScope CurrentScope
+        {
+            get
+            {
+                var objectHandle = CallContext.LogicalGetData(_currentScopeKey) as ObjectHandle;
+                return objectHandle?.Unwrap() as SerilogLoggerScope;
+            }
+            set
+            {
+                CallContext.LogicalSetData(_currentScopeKey, new ObjectHandle(value));
+            }
+        }
+#endif
 
         public void Dispose() { }
     }

src/Serilog.Extensions.Logging/project.json

@@ -18,7 +18,15 @@
     "warningsAsErrors": true
   },
   "frameworks": {
+    "net4.5": {
+      "frameworkAssemblies": {
+        "System.Runtime": ""
+      }
+    },
     "netstandard1.3": {
+      "buildOptions": {
+        "define": ["ASYNCLOCAL"]
+      },
       "dependencies": {
         "System.Threading": "4.0.11-rc2-24027"
       }