Merge pull request #26 from nkz-soft/net8.0-and-net9.0

nkz-soft · web-flow · commit 4d0e6241b7ba · 2025-04-15T19:29:34.000+03:00
Support net8.0 and net9.0
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build
         run: dotnet build -c Release
       - name: Test
diff --git a/.github/workflows/publish-nuget.yaml b/.github/workflows/publish-nuget.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Build
       run: dotnet build -c Release
     - name: Test
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,12 +1,19 @@
 <Project>
   <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
-    <Features>strict</Features>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <Features>strict</Features>    
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AnalysisLevel>latest-Recommended</AnalysisLevel>
+    <AnalysisMode>Recommended</AnalysisMode>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,8 +30,20 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);MA0165;AV1500</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
+    <PackageReference Include="Meziantou.Analyzer" PrivateAssets="All"/>
+    <PackageReference Include="Roslynator.Analyzers" PrivateAssets="All"/>
+    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" PrivateAssets="All"/>
+    <PackageReference Include="Roslynator.Formatting.Analyzers"  PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All"/>
+    <PackageReference Include="AsyncAwaitBestPractices" PrivateAssets="All"/>
+    <PackageReference Include="SerilogAnalyzer" PrivateAssets="All"/>
+    <PackageReference Include="CSharpGuidelinesAnalyzer" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,23 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
+    <PackageVersion Include="Serilog.Enrichers.Sensitive" Version="1.7.3" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.196" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.13.1" />
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.13.1" />
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.13.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61" />
+    <PackageVersion Include="AsyncAwaitBestPractices" Version="9.0.0" />
+    <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
+    <PackageVersion Include="CSharpGuidelinesAnalyzer" Version="3.8.5" />
+  </ItemGroup>
+</Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": true
   }
diff --git a/src/NKZSoft.Service.Configuration.Logger/Constants.cs b/src/NKZSoft.Service.Configuration.Logger/Constants.cs
diff --git a/src/NKZSoft.Service.Configuration.Logger/NKZSoft.Service.Configuration.Logger.csproj b/src/NKZSoft.Service.Configuration.Logger/NKZSoft.Service.Configuration.Logger.csproj
@@ -1,22 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <RepositoryUrl>https://github.com/nkz-soft/NKZSoft.Service.Configuration.Logger</RepositoryUrl>
-        <Version>1.3.2</Version>
+        <Version>2.0.0</Version>
         <Description>Provides the configuration for Serilog</Description>
-        <Copyright>Copyright © 2024</Copyright>
+        <Copyright>Copyright© 2025</Copyright>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Serilog" Version="4.2.0" />
-      <PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
-      <PackageReference Include="Serilog.Enrichers.Sensitive" Version="1.7.3" />
-      <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-      <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-      <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
-      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+      <PackageReference Include="Serilog" />
+      <PackageReference Include="Serilog.Enrichers.CorrelationId" />
+      <PackageReference Include="Serilog.Enrichers.Sensitive" />
+      <PackageReference Include="Serilog.Extensions.Logging" />
+      <PackageReference Include="Serilog.Sinks.Console" />
+      <PackageReference Include="Serilog.Sinks.File" />
+      <PackageReference Include="Serilog.Settings.Configuration" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" />
     </ItemGroup>
 
 </Project>
diff --git a/src/NKZSoft.Service.Configuration.Logger/ServiceCollectionExtensions.cs b/src/NKZSoft.Service.Configuration.Logger/ServiceCollectionExtensions.cs
@@ -1,8 +1,12 @@
 namespace NKZSoft.Service.Configuration.Logger;
 
+/// <summary>
+/// Extension methods for <see cref="IServiceCollection"/>
+/// </summary>
 public static class ServiceCollectionExtensions
 {
     private const string MicroserviceNameProperty = "MicroserviceName";
+    private const string CorrelationId = "X-Correlation-Id";
 
     /// <summary>
     /// Add Serilog to the logging pipeline.
@@ -15,24 +19,27 @@ public static IServiceCollection AddLogging(this IServiceCollection services, IC
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(configuration);
 
-        var serviceName = Assembly.GetCallingAssembly().GetName().Name!;
+        var serviceName = Assembly.GetCallingAssembly().GetName().Name;
 
         services.AddLogging(loggingBuilder =>
             loggingBuilder.AddSerilog(dispose: true));
 
         var logger = new LoggerConfiguration()
             .ReadFrom.Configuration(configuration)
-            .Enrich.WithProperty(MicroserviceNameProperty, serviceName, true)
+            .Enrich.WithProperty(MicroserviceNameProperty, serviceName, destructureObjects: true)
             .Enrich.FromLogContext()
-            .Enrich.WithCorrelationIdHeader(Constants.Headers.CorrelationId)
-            .WriteTo.Console(formatProvider:CultureInfo.InvariantCulture)
+            .Enrich.WithCorrelationIdHeader(CorrelationId)
+            .WriteTo.Console(formatProvider: CultureInfo.InvariantCulture)
             .CreateLogger();
 
         Log.Logger = logger;
 
-        var loggerFactory = new LoggerFactory();
-        loggerFactory.AddSerilog(logger);
-        services.AddSingleton<ILoggerFactory>(loggerFactory);
+        services.AddSingleton<ILoggerFactory>(_ =>
+        {
+            var factory = new LoggerFactory();
+            factory.AddSerilog(logger);
+            return factory;
+        });
 
         return services;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.0",`
	`3`	`+ "version": "9.0.0",`
`4`	`4`	`"rollForward": "latestMinor",`
`5`	`5`	`"allowPrerelease": true`
`6`	`6`	`}`