Skip to content

Commit 743dadf

Browse files
mo-esmpmo-esmp
authored
Update dependencies and add .NET 10 support. (#67)
- Upgrade NuGet packages to latest versions across projects - Add .NET 10.0 target to Serilog.Enrichers.ClientInfo - Replace Serilog.Enrichers.ClientInfo package with project reference in SampleWebApp - Update code for ASP.NET Core API changes (KnownIPNetworks)
1 parent 5221b0e commit 743dadf

File tree

5 files changed

+42
-35
lines changed

5 files changed

+42
-35
lines changed

‎Serilog.Enrichers.ClientInfo.nuspec‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,27 @@
1616
<tags>serilog enrichers enricher ip correlation-id request header</tags>
1717
<copyright>© 2025 Serilog Contributors</copyright>
1818
<releaseNotes>
19-
- Allow customizing ClientIP property name for OpenTelemetry conventions.
19+
- Update dependencies and add .NET 10 support.
2020
</releaseNotes>
2121
<dependencies>
2222
<group targetFramework=".NET8.0">
23-
<dependency id="Microsoft.AspNetCore.Http" version="2.3.0" />
23+
<dependency id="Microsoft.AspNetCore.Http" version="2.3.9" />
2424
<dependency id="Serilog" version="4.3.0" />
2525
</group>
2626
<group targetFramework=".NET9.0">
27-
<dependency id="Microsoft.AspNetCore.Http" version="2.3.0" />
27+
<dependency id="Microsoft.AspNetCore.Http" version="2.3.9" />
28+
<dependency id="Serilog" version="4.3.0" />
29+
</group>
30+
<group targetFramework=".NET10.0">
31+
<dependency id="Microsoft.AspNetCore.Http" version="2.3.9" />
2832
<dependency id="Serilog" version="4.3.0" />
2933
</group>
3034
</dependencies>
3135
</metadata>
3236
<files>
3337
<file src="src\Serilog.Enrichers.ClientInfo\bin\release\net8.0\*" target="lib/net8.0" />
3438
<file src="src\Serilog.Enrichers.ClientInfo\bin\release\net9.0\*" target="lib/net9.0" />
39+
<file src="src\Serilog.Enrichers.ClientInfo\bin\release\net10.0\*" target="lib/net10.0" />
3540
<file src="README.md" target="docs\" />
3641
<file src="icon.png" target="assets\" />
3742
</files>

‎sample/SampleWebApp/SampleWebApp.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
11-
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.1" />
12-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
13-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
14-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
10+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
11+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
12+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
13+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<ProjectReference Include="..\..\src\Serilog.Enrichers.ClientInfo\Serilog.Enrichers.ClientInfo.csproj" />
1518
</ItemGroup>
1619
</Project>

‎src/Serilog.Enrichers.ClientInfo/Serilog.Enrichers.ClientInfo.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<AssemblyName>Serilog.Enrichers.ClientInfo</AssemblyName>
55
<RootNamespace>Serilog</RootNamespace>
66
<LangVersion>latest</LangVersion>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<DebugType>embedded</DebugType>
99
<EmbedAllSources>true</EmbedAllSources>
10-
<Version>2.8.0</Version>
11-
<AssemblyVersion>2.8.0</AssemblyVersion>
10+
<Version>2.9.0</Version>
11+
<AssemblyVersion>2.9.0</AssemblyVersion>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
1616
<PackageReference Include="Serilog" Version="4.3.0" />
1717
</ItemGroup>
1818

‎test/Serilog.Enrichers.ClientInfo.Tests/Serilog.Enrichers.ClientInfo.Tests.csproj‎

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

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

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
11-
<PackageReference Include="nsubstitute" Version="5.1.0" />
12-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
13-
<PackageReference Include="xunit" Version="2.9.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
11+
<PackageReference Include="nsubstitute" Version="5.3.0" />
12+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
18+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

‎test/Serilog.Enrichers.ClientInfo.Tests/TestSetup/WebApi.cs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
using Microsoft.AspNetCore.Builder;
22
using Microsoft.AspNetCore.HttpOverrides;
33
using Microsoft.Extensions.DependencyInjection;
4-
using Microsoft.Extensions.Logging;
54
using Serilog;
65
using Serilog.Enrichers.ClientInfo.Tests;
76
using Serilog.Events;
87

98
Log.Logger = new LoggerConfiguration()
109
.Enrich.WithClientIp()
1110
.Enrich.WithRequestHeader("X-Forwarded-For")
12-
.WriteTo.Sink(new DelegatingSink(e => LogEvent = e, saveLogs: true))
11+
.WriteTo.Sink(new DelegatingSink(e => LogEvent = e, true))
1312
.CreateLogger();
1413

15-
var builder = WebApplication.CreateBuilder(args);
14+
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
1615
builder.Host.UseSerilog();
1716
builder.Services
1817
.AddHttpContextAccessor()
19-
.Configure<ForwardedHeadersOptions>(
20-
options =>
21-
{
22-
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor;
23-
options.KnownNetworks.Clear();
24-
options.KnownProxies.Clear();
25-
});
18+
.Configure<ForwardedHeadersOptions>(options =>
19+
{
20+
options.ForwardedHeaders = ForwardedHeaders.XForwardedFor;
21+
options.KnownIPNetworks.Clear();
22+
options.KnownProxies.Clear();
23+
});
2624

27-
var app = builder.Build();
25+
WebApplication app = builder.Build();
2826

2927
app.UseForwardedHeaders();
3028

@@ -34,8 +32,9 @@
3432

3533
public partial class Program
3634
{
37-
private Program()
38-
{ }
39-
4035
public static LogEvent LogEvent;
36+
37+
private Program()
38+
{
39+
}
4140
}

0 commit comments

Comments
 (0)