Add support for .NET 6.0 & Serilog 2.12.0 (#45)

augustoproiete · web-flow · commit 556401af5b70 · 2022-12-17T21:32:46.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,26 +26,32 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             build: ./build.sh
             push: true
-          - os: windows-2019
-            build: ./build.cmd
           - os: windows-2022
             build: ./build.cmd
-          - os: macos-11
+          - os: macos-12
             build: ./build.sh
     name: ${{ matrix.job.os }}
     runs-on: ${{ matrix.job.os }}
     steps:
       - name: Setup netcoreapp3.1
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: "3.1.413"
+          dotnet-version: "3.1.426"
       - 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.404"
+      - name: Setup net7.0
+        uses: actions/setup-dotnet@v3.0.3
+        with:
+          dotnet-version: "7.0.101"
       - name: Run dotnet --info
         run: dotnet --info
       - uses: actions/checkout@v3.2.0
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,8 @@
 ﻿<Project>
 
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
+    <NoWarn>$(NoWarn);NU5048;CS8032</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 C. Augusto Proiete & Contributors
+   Copyright 2021-2022 C. Augusto Proiete & Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
@@ -135,4 +135,4 @@ Click on the [Releases](https://github.com/serilog-contrib/serilog-enrichers-glo
 
 ---
 
-_Copyright &copy; 2021 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE)._
+_Copyright &copy; 2021-2022 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE)._
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "allowPrerelease": true,
-    "version": "5.0.100",
-    "rollForward": "latestMajor"
+    "allowPrerelease": false,
+    "version": "7.0.100",
+    "rollForward": "latestFeature"
   }
 }
diff --git a/sample/ConsoleSample/ConsoleSample.csproj b/sample/ConsoleSample/ConsoleSample.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net5.0;netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/ConsoleSample/Program.cs b/sample/ConsoleSample/Program.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/serilog-enrichers-globallogcontext.sln b/serilog-enrichers-globallogcontext.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31402.337
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3F07477D-F01B-488D-91E6-3378AEB6FDFC}"
 EndProject
diff --git a/src/Serilog.Enrichers.GlobalLogContext/Context/GlobalLogContext.cs b/src/Serilog.Enrichers.GlobalLogContext/Context/GlobalLogContext.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Serilog.Enrichers.GlobalLogContext/Enrichers/GlobalLogContext/GlobalLogContextEnricher.cs b/src/Serilog.Enrichers.GlobalLogContext/Enrichers/GlobalLogContext/GlobalLogContextEnricher.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Serilog.Enrichers.GlobalLogContext/ImmutableStack.cs b/src/Serilog.Enrichers.GlobalLogContext/ImmutableStack.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Serilog.Enrichers.GlobalLogContext/LoggerEnrichmentConfigurationExtensions.cs b/src/Serilog.Enrichers.GlobalLogContext/LoggerEnrichmentConfigurationExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/Serilog.Enrichers.GlobalLogContext/Serilog.Enrichers.GlobalLogContext.csproj b/src/Serilog.Enrichers.GlobalLogContext/Serilog.Enrichers.GlobalLogContext.csproj
@@ -1,7 +1,7 @@
 ﻿<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.Enrichers.GlobalLogContext</AssemblyName>
@@ -32,7 +32,7 @@
     <Authors>C. Augusto Proiete &amp; Contributors</Authors>
     <Company>augustoproiete.net</Company>
     <Description>A Serilog Enricher for adding properties to all log events in your app.</Description>
-    <Copyright>Copyright 2021 C. Augusto Proiete &amp; Contributors - Provided under the Apache License, Version 2.0</Copyright>
+    <Copyright>Copyright 2021-2022 C. Augusto Proiete &amp; Contributors - Provided under the Apache License, Version 2.0</Copyright>
     <PackageTags>serilog;enricher;enrichers;globallogcontext;global-log-context;globalcontext;global-context;logcontext;log-context;serilog-enricher;serilog-contrib;augustoproiete;augusto-proiete</PackageTags>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageIcon>images\icon.png</PackageIcon>
@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.11.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.Enrichers.GlobalLogContext.Tests/Context/GlobalLogContextTests.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Context/GlobalLogContextTests.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Enrichers/GlobalLogContextEnricherTests.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Enrichers/GlobalLogContextEnricherTests.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Serilog.Enrichers.GlobalLogContext.Tests.csproj b/test/Serilog.Enrichers.GlobalLogContext.Tests/Serilog.Enrichers.GlobalLogContext.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net452</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1;net452</TargetFrameworks>
     <IsPackable>false</IsPackable>
 
     <SignAssembly>true</SignAssembly>
@@ -24,7 +24,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog" Version="2.12.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/DelegatingSink.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/DelegatingSink.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/ForceNewThreadSyncContext.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/ForceNewThreadSyncContext.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/LogEventPropertyValueExtensions.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/LogEventPropertyValueExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/Some.cs b/test/Serilog.Enrichers.GlobalLogContext.Tests/Support/Some.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright 2021 C. Augusto Proiete & Contributors
+﻿#region Copyright 2021-2022 C. Augusto Proiete & Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -135,4 +135,4 @@ Click on the [Releases](https://github.com/serilog-contrib/serilog-enrichers-glo`
`135`	`135`
`136`	`136`	`---`
`137`	`137`
`138`		`-_Copyright © 2021 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE)._`
	`138`	`+_Copyright © 2021-2022 C. Augusto Proiete & Contributors - Provided under the [Apache License, Version 2.0](LICENSE)._`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "allowPrerelease": true,`
`4`		`- "version": "5.0.100",`
`5`		`- "rollForward": "latestMajor"`
	`3`	`+ "allowPrerelease": false,`
	`4`	`+ "version": "7.0.100",`
	`5`	`+ "rollForward": "latestFeature"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#region Copyright 2021 C. Augusto Proiete & Contributors`
	`1`	`+#region Copyright 2021-2022 C. Augusto Proiete & Contributors`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`