Skip to content

Commit 788d2a7

Browse files
authored
Merge pull request #236 from serilog/netstandard-20
Re-enable .NET Framework support through netstandard2.0
2 parents 6ddace9 + 914b62f commit 788d2a7

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/Serilog.AspNetCore/Serilog.AspNetCore.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>Serilog support for ASP.NET Core logging</Description>
55
<VersionPrefix>4.0.0</VersionPrefix>
66
<Authors>Microsoft;Serilog Contributors</Authors>
7-
<TargetFramework>netstandard2.1</TargetFramework>
7+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
@@ -26,15 +26,12 @@
2626

2727
<ItemGroup>
2828
<PackageReference Include="Serilog" Version="2.10.0" />
29-
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.0.0" />
29+
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.0" />
3030
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3131
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
3232
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
3333
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
3434
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3835
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
3936
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
4037
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />

test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
using System;
55
using System.Linq;
66
using System.Threading.Tasks;
7-
87
using Xunit;
9-
108
using Microsoft.Extensions.DependencyInjection;
119
using Microsoft.AspNetCore.Hosting;
1210
using Microsoft.AspNetCore.Mvc.Testing;
1311
using Microsoft.AspNetCore.Builder;
14-
1512
using Serilog.Filters;
1613
using Serilog.AspNetCore.Tests.Support;
1714

0 commit comments

Comments
 (0)