Skip to content

Commit 0ddce6f

Browse files
nblumhardtnblumhardt
authored
Merge pull request #402 from serilog/dev
10.0.0 Release
2 parents bf7a68d + 6c9517c commit 0ddce6f

8 files changed

Lines changed: 32 additions & 23 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup
2727
uses: actions/setup-dotnet@v4
2828
with:
29-
dotnet-version: 9.0.x
29+
dotnet-version: 10.0.x
3030
- name: Compute build number
3131
shell: bash
3232
run: |

‎Directory.Version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<!-- This must match the major and minor components of the referenced *.Extensions.* packages (and highest supported .NET TFM). -->
4-
<VersionPrefix>9.0.0</VersionPrefix>
4+
<VersionPrefix>10.0.0</VersionPrefix>
55
</PropertyGroup>
66
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

‎samples/Sample/Sample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GenerateDocumentationFile>false</GenerateDocumentationFile>
66
</PropertyGroup>
77

‎src/Serilog.AspNetCore/Serilog.AspNetCore.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>Serilog support for ASP.NET Core logging</Description>
55
<Authors>Microsoft;Serilog Contributors</Authors>
6-
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
77
<PackageTags>serilog;aspnet;aspnetcore</PackageTags>
88
<PackageIcon>icon.png</PackageIcon>
99
<PackageProjectUrl>https://github.com/serilog/serilog-aspnetcore</PackageProjectUrl>
@@ -20,17 +20,17 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Serilog" Version="4.2.0-*" />
24-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
25-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
23+
<PackageReference Include="Serilog" Version="4.3.0" />
24+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
25+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
2626
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
2727
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
3131
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
32-
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0-*" />
33-
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0-*" />
32+
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
33+
<PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup Condition=" '$(TargetFramework)' != 'net462' and '$(TargetFramework)' != 'netstandard2.0' and '$(TargetFramework)' != 'netstandard2.1' ">
@@ -39,8 +39,8 @@
3939
</ItemGroup>
4040

4141
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
42-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
43-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
42+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.3.0" />
43+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
4444
</ItemGroup>
4545

4646
</Project>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GenerateDocumentationFile>false</GenerateDocumentationFile>
66
</PropertyGroup>
77

@@ -10,10 +10,10 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
15-
<PackageReference Include="xunit" Version="2.9.2" />
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
1717
</ItemGroup>
1818

1919
</Project>

‎test/Serilog.AspNetCore.Tests/SerilogWebHostBuilderExtensionsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public async Task RequestLoggingMiddlewareShouldEnrichWithUnhandledExceptionEven
134134
Assert.Same(unhandledException, thrownException);
135135
}
136136

137-
WebApplicationFactory<TestStartup> Setup(
137+
WebApplicationFactory<TestEntryPoint> Setup(
138138
ILogger logger,
139139
bool dispose,
140140
Action<RequestLoggingOptions>? configureOptions = null,
@@ -177,7 +177,7 @@ public async Task RequestLoggingMiddlewareShouldAddTraceAndSpanIds()
177177
Assert.NotNull(completionEvent.SpanId);
178178
}
179179

180-
(SerilogSink, WebApplicationFactory<TestStartup>) Setup(
180+
(SerilogSink, WebApplicationFactory<TestEntryPoint>) Setup(
181181
Action<RequestLoggingOptions>? configureOptions = null,
182182
Action<HttpContext>? actionCallback = null)
183183
{

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
using Microsoft.AspNetCore.Hosting;
22
using Microsoft.AspNetCore.Mvc.Testing;
3+
using Microsoft.Extensions.Hosting;
34

45
namespace Serilog.AspNetCore.Tests.Support;
56

67
// ReSharper disable once ClassNeverInstantiated.Global
7-
public class SerilogWebApplicationFactory : WebApplicationFactory<TestStartup>
8+
public class TestEntryPoint;
9+
10+
// ReSharper disable once ClassNeverInstantiated.Global
11+
public class SerilogWebApplicationFactory : WebApplicationFactory<TestEntryPoint>
812
{
9-
protected override IWebHostBuilder CreateWebHostBuilder() => new WebHostBuilder().UseStartup<TestStartup>();
10-
protected override void ConfigureWebHost(IWebHostBuilder builder) => builder.UseContentRoot(".");
11-
}
13+
protected override IHostBuilder CreateHostBuilder()
14+
{
15+
return new HostBuilder();
16+
}
1217

13-
public class TestStartup { }
18+
protected override void ConfigureWebHost(IWebHostBuilder builder)
19+
{
20+
builder.UseContentRoot(".");
21+
}
22+
}

0 commit comments

Comments
 (0)