Merge pull request #401 from nblumhardt/dotnet-10

Update to .NET 10 SDK and dependencies

Author: nblumhardt

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Compute build number
         shell: bash
         run: |

Directory.Version.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <!-- This must match the major and minor components of the referenced *.Extensions.* packages (and highest supported .NET TFM). -->
-    <VersionPrefix>9.0.1</VersionPrefix>
+    <VersionPrefix>10.0.0</VersionPrefix>
   </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

samples/Sample/Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 

src/Serilog.AspNetCore/Serilog.AspNetCore.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Serilog support for ASP.NET Core logging</Description>
     <Authors>Microsoft;Serilog Contributors</Authors>
-    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageTags>serilog;aspnet;aspnetcore</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/serilog/serilog-aspnetcore</PackageProjectUrl>
@@ -20,17 +20,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="4.2.0-*" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0-*" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0-*" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netstandard2.1' ">

test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -10,10 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
-    <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
   </ItemGroup>
 
 </Project>

test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs

@@ -134,7 +134,7 @@ public async Task RequestLoggingMiddlewareShouldEnrichWithUnhandledExceptionEven
         Assert.Same(unhandledException, thrownException);
     }
 
-    WebApplicationFactory<TestStartup> Setup(
+    WebApplicationFactory<TestEntryPoint> Setup(
         ILogger logger,
         bool dispose,
         Action<RequestLoggingOptions>? configureOptions = null,
@@ -177,7 +177,7 @@ public async Task RequestLoggingMiddlewareShouldAddTraceAndSpanIds()
         Assert.NotNull(completionEvent.SpanId);
     }
 
-    (SerilogSink, WebApplicationFactory<TestStartup>) Setup(
+    (SerilogSink, WebApplicationFactory<TestEntryPoint>) Setup(
         Action<RequestLoggingOptions>? configureOptions = null,
         Action<HttpContext>? actionCallback = null)
     {

test/Serilog.AspNetCore.Tests/Support/SerilogWebApplicationFactory.cs

@@ -1,13 +1,22 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.Extensions.Hosting;
 
 namespace Serilog.AspNetCore.Tests.Support;
 
 // ReSharper disable once ClassNeverInstantiated.Global
-public class SerilogWebApplicationFactory : WebApplicationFactory<TestStartup>
+public class TestEntryPoint;
+
+// ReSharper disable once ClassNeverInstantiated.Global
+public class SerilogWebApplicationFactory : WebApplicationFactory<TestEntryPoint>
 {
-    protected override IWebHostBuilder CreateWebHostBuilder() => new WebHostBuilder().UseStartup<TestStartup>();
-    protected override void ConfigureWebHost(IWebHostBuilder builder) => builder.UseContentRoot(".");
-}
+    protected override IHostBuilder CreateHostBuilder()
+    {
+        return new HostBuilder();
+    }
 
-public class TestStartup { }
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
+    {
+        builder.UseContentRoot(".");
+    }
+}