diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6c772d4..47b16c3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,6 @@ env: DOTNET_NOLOGO: true dotnet-version: | 8.0.x - 7.0.x 6.0.x 3.1.x diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96536d9..8162008 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,6 @@ env: DOTNET_NOLOGO: true dotnet-version: | 8.0.x - 7.0.x 6.0.x 3.1.x diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 8ec8252..d0b3043 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -14,7 +14,6 @@ env: DOTNET_NOLOGO: true dotnet-version: | 8.0.x - 7.0.x 6.0.x 3.1.x diff --git a/Directory.Build.props b/Directory.Build.props index cfc53f6..8cc6495 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,10 +21,6 @@ 8.0.0 - - 7.0.0 - - 6.0.0 diff --git a/README.md b/README.md index f3ea671..e8d7567 100644 --- a/README.md +++ b/README.md @@ -202,15 +202,15 @@ Please consider that .NET Core 3.1 and up now has built-in support for [W3C Trac ## More info ### Supported .NET targets -- .NET 6.0, .NET 7.0 +- .NET 6.0, .NET 8.0 - .NET Standard 2.0/.NET Core 3.1 ### ASP.NET Core support -- ASP.NET Core 3.1/6.0/7.0 +- ASP.NET Core 6.0/8.0 ### Build requirements - Visual Studio 2022 -- .NET 7 SDK +- .NET 8 SDK - .NET 6 SDK - .NET 3.1 SDK diff --git a/examples/Serilog/Client/Client.csproj b/examples/Serilog/Client/Client.csproj index b7b550c..fe0c934 100644 --- a/examples/Serilog/Client/Client.csproj +++ b/examples/Serilog/Client/Client.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 @@ -18,9 +18,9 @@ - - - + + + diff --git a/examples/Serilog/Service/Program.cs b/examples/Serilog/Service/Program.cs index 03ba23f..947e314 100644 --- a/examples/Serilog/Service/Program.cs +++ b/examples/Serilog/Service/Program.cs @@ -4,13 +4,16 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args); -builder.WebHost - .UseSerilog((ctx, loggerConfig) => loggerConfig - .ReadFrom.Configuration(ctx.Configuration) - .Enrich.FromLogContext() - // Add the property to the template explicitly, or log all properties with {Properties}. - .WriteTo.Console(outputTemplate: "Message: {Message:lj}{NewLine}\tCorrelation ID: {CorrelationId}{NewLine}") - .WriteTo.Debug() +builder.Services + .AddLogging(configure => configure.AddSerilog( + new LoggerConfiguration() + .ReadFrom.Configuration(builder.Configuration) + .Enrich.FromLogContext() + // Add the property to the template explicitly, or log all properties with {Properties}. + .WriteTo.Console(outputTemplate: "Message: {Message:lj}{NewLine}\tCorrelation ID: {CorrelationId}{NewLine}") + .WriteTo.Debug() + .CreateLogger() + ) ); builder.Services diff --git a/examples/Serilog/Service/Service.csproj b/examples/Serilog/Service/Service.csproj index b26d256..6c63e86 100644 --- a/examples/Serilog/Service/Service.csproj +++ b/examples/Serilog/Service/Service.csproj @@ -1,12 +1,12 @@  - net7.0 + net8.0 - - + + diff --git a/src/Correlate.Abstractions/Correlate.Abstractions.csproj b/src/Correlate.Abstractions/Correlate.Abstractions.csproj index a2373cd..dfaae7a 100644 --- a/src/Correlate.Abstractions/Correlate.Abstractions.csproj +++ b/src/Correlate.Abstractions/Correlate.Abstractions.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.0 + net8.0;net6.0;netstandard2.0 Correlate diff --git a/src/Correlate.AspNetCore/Correlate.AspNetCore.csproj b/src/Correlate.AspNetCore/Correlate.AspNetCore.csproj index 78c4ff4..28f9709 100644 --- a/src/Correlate.AspNetCore/Correlate.AspNetCore.csproj +++ b/src/Correlate.AspNetCore/Correlate.AspNetCore.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netcoreapp3.1 + net8.0;net6.0;netcoreapp3.1 Correlate diff --git a/src/Correlate.Core/Correlate.Core.csproj b/src/Correlate.Core/Correlate.Core.csproj index f5080a6..f657b01 100644 --- a/src/Correlate.Core/Correlate.Core.csproj +++ b/src/Correlate.Core/Correlate.Core.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.0 + net8.0;net6.0;netstandard2.0 Correlate diff --git a/src/Correlate.DependencyInjection/Correlate.DependencyInjection.csproj b/src/Correlate.DependencyInjection/Correlate.DependencyInjection.csproj index 79f8877..7619f22 100644 --- a/src/Correlate.DependencyInjection/Correlate.DependencyInjection.csproj +++ b/src/Correlate.DependencyInjection/Correlate.DependencyInjection.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.0 + net8.0;net6.0;netstandard2.0 diff --git a/test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj b/test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj index a7f9e13..2da9d21 100644 --- a/test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj +++ b/test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netcoreapp3.1 + net8.0;net6.0;netcoreapp3.1 true Correlate @@ -11,11 +11,6 @@ 8.0.0 - - 7.0.10 - 7.0.0 - - 6.0.21 6.1.0 diff --git a/test/Correlate.Benchmarks/Correlate.Benchmarks.csproj b/test/Correlate.Benchmarks/Correlate.Benchmarks.csproj index 9903e8d..2366d63 100644 --- a/test/Correlate.Benchmarks/Correlate.Benchmarks.csproj +++ b/test/Correlate.Benchmarks/Correlate.Benchmarks.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net7.0;net6.0 + net8.0;net6.0 enable enable false diff --git a/test/Correlate.Benchmarks/README.md b/test/Correlate.Benchmarks/README.md index a04ab83..49355f0 100644 --- a/test/Correlate.Benchmarks/README.md +++ b/test/Correlate.Benchmarks/README.md @@ -13,13 +13,10 @@ Intel Core i7-8700K CPU 3.70GHz (Coffee Lake), 1 CPU, 12 logical and 6 physical | Method | Job | Runtime | Arguments | NuGetReferences | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Allocated | Alloc Ratio | |-------- |------- |--------- |------------------------ |--------------------------------------------------------------- |---------:|--------:|--------:|------:|--------:|-------:|----------:|------------:| | ApiCall | v4.0.0 | .NET 6.0 | /p:CurrentVersion=false | Correlate.AspNetCore 4.0.0,Correlate.DependencyInjection 4.0.0 | 169.6 us | 1.53 us | 1.36 us | 1.04 | 0.01 | 0.4883 | 4.33 KB | 1.15 | -| ApiCall | v4.0.0 | .NET 7.0 | /p:CurrentVersion=false | Correlate.AspNetCore 4.0.0,Correlate.DependencyInjection 4.0.0 | 174.8 us | 1.96 us | 1.64 us | 1.07 | 0.01 | 0.4883 | 4.06 KB | 1.08 | | ApiCall | v4.0.0 | .NET 8.0 | /p:CurrentVersion=false | Correlate.AspNetCore 4.0.0,Correlate.DependencyInjection 4.0.0 | 165.5 us | 2.35 us | 2.20 us | 1.02 | 0.02 | 0.4883 | 3.87 KB | 1.03 | | ApiCall | v5.1.0 | .NET 6.0 | /p:CurrentVersion=false | Correlate.AspNetCore 5.1.0,Correlate.DependencyInjection 5.1.0 | 168.7 us | 2.30 us | 2.15 us | 1.03 | 0.01 | 0.4883 | 4.17 KB | 1.11 | -| ApiCall | v5.1.0 | .NET 7.0 | /p:CurrentVersion=false | Correlate.AspNetCore 5.1.0,Correlate.DependencyInjection 5.1.0 | 169.9 us | 0.78 us | 0.65 us | 1.04 | 0.01 | 0.4883 | 3.91 KB | 1.04 | | ApiCall | v5.1.0 | .NET 8.0 | /p:CurrentVersion=false | Correlate.AspNetCore 5.1.0,Correlate.DependencyInjection 5.1.0 | 162.6 us | 2.31 us | 2.05 us | 0.99 | 0.01 | 0.4883 | 3.75 KB | 1.00 | | ApiCall | vNext | .NET 6.0 | Default | Default | 166.2 us | 1.70 us | 1.50 us | 1.02 | 0.02 | 0.4883 | 4.17 KB | 1.11 | -| ApiCall | vNext | .NET 7.0 | Default | Default | 170.6 us | 1.15 us | 1.02 us | 1.05 | 0.01 | 0.4883 | 3.91 KB | 1.04 | | ApiCall | vNext | .NET 8.0 | Default | Default | 163.2 us | 1.60 us | 1.34 us | 1.00 | 0.00 | 0.4883 | 3.75 KB | 1.00 | ### CLI @@ -27,5 +24,5 @@ Intel Core i7-8700K CPU 3.70GHz (Coffee Lake), 1 CPU, 12 logical and 6 physical To run the benchmark: ``` cd ./test/Correlate.Benchmarks -dotnet run -c Release -f net8.0 --runtimes net80 net70 net60 +dotnet run -c Release -f net8.0 --runtimes net80 net60 ``` diff --git a/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj b/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj index 10f4107..4bfea15 100644 --- a/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj +++ b/test/Correlate.Core.Tests/Correlate.Core.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netcoreapp3.1 + net8.0;net6.0;netcoreapp3.1 true Correlate diff --git a/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj b/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj index e8e1eea..c4c1e18 100644 --- a/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj +++ b/test/Correlate.DependencyInjection.Tests/Correlate.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netcoreapp3.1 + net8.0;net6.0;netcoreapp3.1 true Correlate.DependencyInjection diff --git a/test/Correlate.Testing/Correlate.Testing.csproj b/test/Correlate.Testing/Correlate.Testing.csproj index 2f7d860..6d7efcd 100644 --- a/test/Correlate.Testing/Correlate.Testing.csproj +++ b/test/Correlate.Testing/Correlate.Testing.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0;netstandard2.1 + net8.0;net6.0;netstandard2.1 false @@ -9,10 +9,6 @@ 8.0.0 - - 7.0.0 - - 3.1.0 diff --git a/test/Correlate.Testing/TestLogger.cs b/test/Correlate.Testing/TestLogger.cs index a1d1f6f..329b7c8 100644 --- a/test/Correlate.Testing/TestLogger.cs +++ b/test/Correlate.Testing/TestLogger.cs @@ -45,7 +45,7 @@ public bool IsEnabled(LogLevel logLevel) return _isEnabled; } -#if NET7_0_OR_GREATER +#if NET8_0_OR_GREATER public IDisposable BeginScope(TState state) where TState : notnull #else