Merge pull request serilog#836 from nblumhardt/f-asynclocal4.6

Use AsyncLocal rather than LogicalCallContext on .NET 4.6
ite-klass · Aug 28, 2016 · 7560d2b · 7560d2b
2 parents 356156e + 9a47ac0
commit 7560d2b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Serilog/project.json b/src/Serilog/project.json
@@ -22,6 +22,11 @@
         "define": [ "REMOTING" ]
       }
     },
+    "net4.6": {
+      "buildOptions": {
+        "define": [ "ASYNCLOCAL" ]
+      }
+    },
     "netstandard1.0": {
       "dependencies": {
         "Microsoft.CSharp": "4.0.1",

diff --git a/test/Serilog.Tests/Context/LogContextTests.cs b/test/Serilog.Tests/Context/LogContextTests.cs
@@ -3,9 +3,11 @@
 using Serilog.Events;
 using Serilog.Core.Enrichers;
 using Serilog.Tests.Support;
-#if REMOTING
+#if APPDOMAIN
 using System;
 using System.IO;
+#endif
+#if REMOTING
 using System.Runtime.Remoting.Messaging;
 #endif
 using System.Threading;
@@ -155,7 +157,7 @@ public void DoesNotPreventCrossDomainCalls()
 #endif
     }
 
-#if REMOTING
+#if REMOTING || APPDOMAIN
     public class RemotelyCallable : MarshalByRefObject
     {
         public bool IsCallable()

diff --git a/test/Serilog.Tests/project.json b/test/Serilog.Tests/project.json
@@ -17,6 +17,11 @@
         "define": [ "APPDOMAIN", "REMOTING", "GETCURRENTMETHOD" ]
       }
     },
+    "net4.6": {
+      "buildOptions": {
+        "define": [ "ASYNCLOCAL", "APPDOMAIN", "GETCURRENTMETHOD" ]
+      }
+    },
     "netcoreapp1.0": {
       "define": [ "ASYNCLOCAL" ],
       "dependencies": {