Merge pull request #131 from DigiBanks99/dev

Upgraded Microsoft.Extensions.Logging NuGet packages to 2.0.0

Author: nblumhardt

build.sh

@@ -3,7 +3,6 @@ dotnet --info
 dotnet restore
 
 for path in src/**/*.csproj; do
-    dotnet build -f netstandard1.3 -c Release ${path}
     dotnet build -f netstandard2.0 -c Release ${path}
 
 done

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

@@ -2,12 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-#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;
@@ -93,7 +88,6 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
             }
         }
 
-#if ASYNCLOCAL
         readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
 
         internal SerilogLoggerScope CurrentScope
@@ -107,22 +101,6 @@ internal SerilogLoggerScope CurrentScope
                 _value.Value = value;
             }
         }
-#else
-        readonly string _currentScopeKey = nameof(SerilogLoggerScope) + "#" + Guid.NewGuid().ToString("n");
-
-        internal SerilogLoggerScope CurrentScope
-        {
-            get
-            {
-                var objectHandle = CallContext.LogicalGetData(_currentScopeKey) as ObjectHandle;
-                return objectHandle?.Unwrap() as SerilogLoggerScope;
-            }
-            set
-            {
-                CallContext.LogicalSetData(_currentScopeKey, new ObjectHandle(value));
-            }
-        }
-#endif
 
         /// <inheritdoc />
         public void Dispose()

src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Low-level Serilog provider for Microsoft.Extensions.Logging</Description>

test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>