From 0b04a54545e16afcc8db25e1cefbc3491db10abc Mon Sep 17 00:00:00 2001
From: "C. Augusto Proiete" <augusto@proiete.com>
Date: Tue, 13 Dec 2022 02:07:45 -0400
Subject: [PATCH] Add support for .NET 6.0 & Serilog 2.12.0

---
 .github/workflows/ci.yml                               | 10 +++++++---
 Directory.Build.props                                  |  6 +++++-
 global.json                                            |  2 +-
 sample/ConsoleDemo/ConsoleDemo.csproj                  |  3 +--
 src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj |  6 +++---
 .../Serilog.Sinks.Notepad.Tests.csproj                 |  5 ++---
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87b1b6b..6abb7d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - os: windows-2019
+          - os: windows-2022
             build: ./build.cmd
             push: true
     name: ${{ matrix.job.os }}
@@ -35,11 +35,15 @@ jobs:
       - name: Setup netcoreapp3.1
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: "3.1.413"
+          dotnet-version: "3.1.425"
       - name: Setup net5.0
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: "5.0.401"
+          dotnet-version: "5.0.408"
+      - name: Setup net6.0
+        uses: actions/setup-dotnet@v3.0.3
+        with:
+          dotnet-version: "6.0.403"
       - name: Run dotnet --info
         run: dotnet --info
       - uses: actions/checkout@v3.2.0
diff --git a/Directory.Build.props b/Directory.Build.props
index 2c3ecd9..b869948 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,11 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>9.0</LangVersion>
+    <NoWarn>$(NoWarn);NU5048;CS8032</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatSpecificWarningsAsErrors />
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json
index 5f35d39..cb771af 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "allowPrerelease": false,
-    "version": "5.0.100",
+    "version": "6.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/sample/ConsoleDemo/ConsoleDemo.csproj b/sample/ConsoleDemo/ConsoleDemo.csproj
index 4c1a8f8..a32072f 100644
--- a/sample/ConsoleDemo/ConsoleDemo.csproj
+++ b/sample/ConsoleDemo/ConsoleDemo.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net45</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj b/src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj
index 447b682..c7ed178 100644
--- a/src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj
+++ b/src/Serilog.Sinks.Notepad/Serilog.Sinks.Notepad.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net45</TargetFrameworks>
     <RootNamespace>Serilog</RootNamespace>
 
     <AssemblyName>Serilog.Sinks.Notepad</AssemblyName>
@@ -18,7 +18,7 @@
 
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PublicSign>true</PublicSign>
 
     <NoWarn>$(NoWarn);NU5048</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.8.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/test/Serilog.Sinks.Notepad.Tests/Serilog.Sinks.Notepad.Tests.csproj b/test/Serilog.Sinks.Notepad.Tests/Serilog.Sinks.Notepad.Tests.csproj
index 731c215..94c5e11 100644
--- a/test/Serilog.Sinks.Notepad.Tests/Serilog.Sinks.Notepad.Tests.csproj
+++ b/test/Serilog.Sinks.Notepad.Tests/Serilog.Sinks.Notepad.Tests.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Serilog.Sinks.Notepad.Tests</AssemblyName>
     <IsPackable>false</IsPackable>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PublicSign>true</PublicSign>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
     <RootNamespace>Serilog</RootNamespace>