Skip to content

Upgraded Microsoft.Extensions.Logging NuGet packages to 2.0.0 #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 21, 2019
Merged

Upgraded Microsoft.Extensions.Logging NuGet packages to 2.0.0 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6abdac
Upgraded Microsoft.Extensions.Logging NuGet packages to 2.0.0
DigiBanks99 Feb 7, 2019
5c7ee2a
Removed all netcore1.3 references and dependent code. Assumed netcore…
DigiBanks99 Feb 8, 2019
17bc472
Merge branch 'dev' into dev
nblumhardt Apr 23, 2019
3ee6f65
Merge branch 'dev' into dev
nblumhardt May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -93,7 +88,6 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
}
}

#if ASYNCLOCAL
readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();

internal SerilogLoggerScope CurrentScope
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net472</TargetFrameworks>
Expand Down