Use the same targets at M.E.Logging

Author: Adam Hathcock

samples/Sample/project.lock.json

@@ -71,14 +71,11 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNX,Version=v4.5.1",
+        "framework": ".NETFramework,Version=v4.5.1",
         "dependencies": {
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
           "Serilog": "2.0.0-beta-423"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
+        }
       }
     },
     "DNXCore,Version=v5.0": {
@@ -192,15 +189,10 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNXCore,Version=v5.0",
+        "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
-          "Microsoft.CSharp": "4.0.0",
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Serilog": "2.0.0-beta-423",
-          "System.Collections": "4.0.10-beta-23516",
-          "System.Console": "4.0.0-beta-23516",
-          "System.Linq": "4.0.0",
-          "System.Threading": "4.0.10-beta-23516"
+          "Serilog": "2.0.0-beta-423"
         }
       },
       "System.Collections/4.0.0": {
@@ -652,14 +644,11 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNX,Version=v4.5.1",
+        "framework": ".NETFramework,Version=v4.5.1",
         "dependencies": {
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
           "Serilog": "2.0.0-beta-423"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
+        }
       }
     },
     "DNX,Version=v4.5.1/win7-x64": {
@@ -731,14 +720,11 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNX,Version=v4.5.1",
+        "framework": ".NETFramework,Version=v4.5.1",
         "dependencies": {
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
           "Serilog": "2.0.0-beta-423"
-        },
-        "frameworkAssemblies": [
-          "System.Runtime"
-        ]
+        }
       }
     },
     "DNXCore,Version=v5.0/win7-x86": {
@@ -1030,15 +1016,10 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNXCore,Version=v5.0",
+        "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
-          "Microsoft.CSharp": "4.0.0",
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Serilog": "2.0.0-beta-423",
-          "System.Collections": "4.0.10-beta-23516",
-          "System.Console": "4.0.0-beta-23516",
-          "System.Linq": "4.0.0",
-          "System.Threading": "4.0.10-beta-23516"
+          "Serilog": "2.0.0-beta-423"
         }
       },
       "System.Collections/4.0.0": {
@@ -1797,15 +1778,10 @@
       },
       "Serilog.Framework.Logging/1.0.0-rc1-final": {
         "type": "project",
-        "framework": "DNXCore,Version=v5.0",
+        "framework": ".NETPlatform,Version=v5.4",
         "dependencies": {
-          "Microsoft.CSharp": "4.0.0",
           "Microsoft.Extensions.Logging": "1.0.0-rc1-final",
-          "Serilog": "2.0.0-beta-423",
-          "System.Collections": "4.0.10-beta-23516",
-          "System.Console": "4.0.0-beta-23516",
-          "System.Linq": "4.0.0",
-          "System.Threading": "4.0.10-beta-23516"
+          "Serilog": "2.0.0-beta-423"
         }
       },
       "System.Collections/4.0.0": {
@@ -3299,7 +3275,7 @@
     "System.Reflection/4.1.0-beta-23225": {
       "type": "package",
       "serviceable": true,
-      "sha512": "WbLtaCxoe5XdqEyZuGpemSQ8YBJ8cj11zx+yxOxJfHbNrmu7oMQ29+J50swaqg3soUc3BVBMqfIhb/7gocDHQA==",
+      "sha512": "nlguo6AocBKGccv4CFSMCOR2/vU+93u/yvzFKO6ViNJ/SBz2VEZ1nOeW93vqKKpOMJkt3YtTvMWmS+kUGz/1bA==",
       "files": [
         "lib/DNXCore50/System.Reflection.dll",
         "lib/MonoAndroid10/_._",
@@ -3794,7 +3770,7 @@
     },
     "System.Text.Encoding/4.0.0": {
       "type": "package",
-      "sha512": "AMxFNOXpA6Ab8swULbXuJmoT2K5w6TnV3ObF5wsmEcIHQUJghoZtDVfVHb08O2wW15mOSI1i9Wg0Dx0pY13o8g==",
+      "sha512": "k4kc8Xq2Bs4x11WWtt6XMa+igtLrZAwJx1ZaB4D3/Sm4LFHSzT4mOOJIDOHa/ePyojOUtwLQdT0ywEnV5nl/9g==",
       "files": [
         "lib/MonoAndroid10/_._",
         "lib/MonoTouch10/_._",

src/Serilog.Framework.Logging/SerilogLoggerProvider.cs

@@ -57,7 +57,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
             }
         }
 
-#if DNXCORE50
+#if NETCORE50 || DOTNET5_4
         private System.Threading.AsyncLocal<SerilogLoggerScope> _value = new System.Threading.AsyncLocal<SerilogLoggerScope>();
         public SerilogLoggerScope CurrentScope
         {

src/Serilog.Framework.Logging/project.json

@@ -13,23 +13,10 @@
 
   "frameworks": {
     "net451": {
-      "frameworkAssemblies": {
-        "System.Runtime": ""
-      }
     },
-    "dnx451": {
-      "frameworkAssemblies": {
-        "System.Runtime": ""
-      }
+    "dotnet5.4": {
     },
-    "dnxcore50": {
-      "dependencies": {
-        "System.Console": "4.0.0-beta-23516",
-        "System.Collections": "4.0.10-beta-23516",
-        "System.Linq": "4.0.0",
-        "System.Threading": "4.0.10-beta-23516",
-        "Microsoft.CSharp": "4.0.0"
-      }
+    "netcore50": {
     }
   }
 }