Skip to content

Commit 6fa6b42

Browse files
Add support for .NET 6.0 & Serilog 2.12.0 (#50)
1 parent fb91394 commit 6fa6b42

File tree

6 files changed

+19
-13
lines changed

6 files changed

+19
-13
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
job:
29-
- os: windows-2019
29+
- os: windows-2022
3030
build: ./build.cmd
3131
push: true
3232
name: ${{ matrix.job.os }}
@@ -35,11 +35,15 @@ jobs:
3535
- name: Setup netcoreapp3.1
3636
uses: actions/[email protected]
3737
with:
38-
dotnet-version: "3.1.413"
38+
dotnet-version: "3.1.425"
3939
- name: Setup net5.0
4040
uses: actions/[email protected]
4141
with:
42-
dotnet-version: "5.0.401"
42+
dotnet-version: "5.0.408"
43+
- name: Setup net6.0
44+
uses: actions/[email protected]
45+
with:
46+
dotnet-version: "6.0.403"
4347
- name: Run dotnet --info
4448
run: dotnet --info
4549
- uses: actions/[email protected]

Directory.Build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<Project>
22

33
<PropertyGroup>
4-
<LangVersion>latest</LangVersion>
4+
<LangVersion>9.0</LangVersion>
5+
<NoWarn>$(NoWarn);NU5048;CS8032</NoWarn>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<TreatSpecificWarningsAsErrors />
8+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
59
</PropertyGroup>
610

711
<ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": false,
4-
"version": "5.0.100",
4+
"version": "6.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

sample/ConsoleDemo/ConsoleDemo.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net5.0;netcoreapp3.1;net45</TargetFrameworks>
6-
<LangVersion>8.0</LangVersion>
5+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net45</TargetFrameworks>
76
</PropertyGroup>
87

98
<ItemGroup>

src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0;netstandard2.0;net45</TargetFrameworks>
3+
<TargetFrameworks>net6.0;net5.0;netstandard2.0;net45</TargetFrameworks>
44
<RootNamespace>Serilog</RootNamespace>
55

66
<AssemblyName>Serilog.Sinks.Notepad</AssemblyName>
@@ -18,7 +18,7 @@
1818

1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
21-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
21+
<PublicSign>true</PublicSign>
2222

2323
<NoWarn>$(NoWarn);NU5048</NoWarn>
2424
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -64,7 +64,7 @@
6464
</ItemGroup>
6565

6666
<ItemGroup>
67-
<PackageReference Include="Serilog" Version="2.8.0" />
67+
<PackageReference Include="Serilog" Version="2.12.0" />
6868
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
6969
</ItemGroup>
7070

test/Serilog.Sinks.Notepad.Tests/Serilog.Sinks.Notepad.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
5-
<LangVersion>8.0</LangVersion>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
65
<AssemblyName>Serilog.Sinks.Notepad.Tests</AssemblyName>
76
<IsPackable>false</IsPackable>
87
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
98
<SignAssembly>true</SignAssembly>
10-
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
9+
<PublicSign>true</PublicSign>
1110
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
1211
<TreatSpecificWarningsAsErrors />
1312
<RootNamespace>Serilog</RootNamespace>

0 commit comments

Comments
 (0)