Skip to content

Commit 5c7ee2a

Browse files
committed
Removed all netcore1.3 references and dependent code. Assumed netcore2.0 dependency from here on out.
1 parent b6abdac commit 5c7ee2a

File tree

5 files changed

+7
-58
lines changed

5 files changed

+7
-58
lines changed

build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dotnet --info
33
dotnet restore
44

55
for path in src/**/*.csproj; do
6-
dotnet build -f netstandard1.3 -c Release ${path}
76
dotnet build -f netstandard2.0 -c Release ${path}
87

98
done

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.0"
3+
"version": "2.0.0"
44
}
55
}

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5-
#if ASYNCLOCAL
65
using System.Threading;
7-
#else
8-
using System.Runtime.Remoting;
9-
using System.Runtime.Remoting.Messaging;
10-
#endif
116
using Microsoft.Extensions.Logging;
127
using Serilog.Core;
138
using Serilog.Events;
@@ -93,7 +88,6 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
9388
}
9489
}
9590

96-
#if ASYNCLOCAL
9791
readonly AsyncLocal<SerilogLoggerScope> _value = new AsyncLocal<SerilogLoggerScope>();
9892

9993
internal SerilogLoggerScope CurrentScope
@@ -107,22 +101,6 @@ internal SerilogLoggerScope CurrentScope
107101
_value.Value = value;
108102
}
109103
}
110-
#else
111-
readonly string _currentScopeKey = nameof(SerilogLoggerScope) + "#" + Guid.NewGuid().ToString("n");
112-
113-
internal SerilogLoggerScope CurrentScope
114-
{
115-
get
116-
{
117-
var objectHandle = CallContext.LogicalGetData(_currentScopeKey) as ObjectHandle;
118-
return objectHandle?.Unwrap() as SerilogLoggerScope;
119-
}
120-
set
121-
{
122-
CallContext.LogicalSetData(_currentScopeKey, new ObjectHandle(value));
123-
}
124-
}
125-
#endif
126104

127105
/// <inheritdoc />
128106
public void Dispose()

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>Low-level Serilog provider for Microsoft.Extensions.Logging</Description>
55
<VersionPrefix>2.0.1</VersionPrefix>
66
<Authors>Microsoft;Serilog Contributors</Authors>
7-
<TargetFrameworks>net45;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>Serilog.Extensions.Logging</AssemblyName>
@@ -24,38 +24,12 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="Serilog" Version="2.8.0" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.3' ">
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.0" />
31-
</ItemGroup>
32-
33-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netstandard2.0' ">
34-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'netstandard1.3' ">
38-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
39-
</ItemGroup>
40-
41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'netstandard2.0' ">
4227
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
4329
</ItemGroup>
4430

45-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
46-
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
47-
</PropertyGroup>
48-
49-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
50-
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
51-
</PropertyGroup>
52-
53-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
54-
<DefineConstants>$(DefineConstants);ASYNCLOCAL</DefineConstants>
55-
</PropertyGroup>
56-
57-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
58-
<DefineConstants>$(DefineConstants);ASYNCLOCAL;LOGGING_BUILDER</DefineConstants>
31+
<PropertyGroup>
32+
<DefineConstants>$(DefineConstants);LOGGING_BUILDER</DefineConstants>
5933
</PropertyGroup>
6034

6135
</Project>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.1;netcoreapp2.0;net46;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
55
<AssemblyName>Serilog.Extensions.Logging.Tests</AssemblyName>
66
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>
88
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
99
<PackageId>Serilog.Extensions.Logging.Tests</PackageId>
1010
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
11-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
12-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
1311
</PropertyGroup>
1412

1513
<ItemGroup>
@@ -22,7 +20,7 @@
2220
<PackageReference Include="xunit" Version="2.2.0" />
2321
</ItemGroup>
2422

25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
2624
<Reference Include="System" />
2725
<Reference Include="Microsoft.CSharp" />
2826
</ItemGroup>

0 commit comments

Comments
 (0)