From 87e316f7d31ae431747d1106976dfceffdecc32c Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Mon, 9 Dec 2024 10:30:09 +1000 Subject: [PATCH 1/4] Dev version bump [skip ci] --- Directory.Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Version.props b/Directory.Version.props index c8c7b22..1249a7d 100644 --- a/Directory.Version.props +++ b/Directory.Version.props @@ -1,6 +1,6 @@ - 9.0.0 + 9.0.1 From 2ff264f7bd4a5f63190875d4f06af87fdd5c12c5 Mon Sep 17 00:00:00 2001 From: Leonid Tsarev Date: Tue, 18 Feb 2025 16:57:02 +0300 Subject: [PATCH 2/4] Update DiagnosticContext.cs --- .../Extensions/Hosting/DiagnosticContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs b/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs index af9b99f..dc8dde8 100644 --- a/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs +++ b/src/Serilog.Extensions.Hosting/Extensions/Hosting/DiagnosticContext.cs @@ -45,7 +45,7 @@ public DiagnosticContextCollector BeginCollection() } /// - public void Set(string propertyName, object value, bool destructureObjects = false) + public void Set(string propertyName, object? value, bool destructureObjects = false) { if (propertyName == null) throw new ArgumentNullException(nameof(propertyName)); From 2ce30f369e639a1eb8a902423cec08e1fbb3c175 Mon Sep 17 00:00:00 2001 From: Leonid Tsarev Date: Tue, 18 Feb 2025 16:58:53 +0300 Subject: [PATCH 3/4] Update IDiagnosticContext.cs --- src/Serilog.Extensions.Hosting/IDiagnosticContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Serilog.Extensions.Hosting/IDiagnosticContext.cs b/src/Serilog.Extensions.Hosting/IDiagnosticContext.cs index c867cf7..24ee2e3 100644 --- a/src/Serilog.Extensions.Hosting/IDiagnosticContext.cs +++ b/src/Serilog.Extensions.Hosting/IDiagnosticContext.cs @@ -29,7 +29,7 @@ public interface IDiagnosticContext /// The property value. /// If true, the value will be serialized as structured /// data if possible; if false, the object will be recorded as a scalar or simple array. - void Set(string propertyName, object value, bool destructureObjects = false); + void Set(string propertyName, object? value, bool destructureObjects = false); /// /// Set the specified exception on the current diagnostic context. From ebb8785c5bb6ab67dbd6700f112a59804a27a32c Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Fri, 28 Nov 2025 16:24:52 +1000 Subject: [PATCH 4/4] Update to .NET 10 SDK and dependencies --- .github/workflows/ci.yml | 2 +- Directory.Version.props | 2 +- global.json | 2 +- .../SimpleServiceSample.csproj | 8 ++++---- .../WebApplicationSample.csproj | 6 +++--- .../Serilog.Extensions.Hosting.csproj | 16 ++++++++++------ .../Serilog.Extensions.Hosting.Tests.csproj | 10 ++++------ 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acd3bc6..8b34c29 100644 --- a/.github/workflows/ci.yml +++ b/.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: | diff --git a/Directory.Version.props b/Directory.Version.props index 1249a7d..bb20770 100644 --- a/Directory.Version.props +++ b/Directory.Version.props @@ -1,6 +1,6 @@ - 9.0.1 + 10.0.0 diff --git a/global.json b/global.json index db8627a..7ca72cb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100", "allowPrerelease": false, "rollForward": "latestFeature" } diff --git a/samples/SimpleServiceSample/SimpleServiceSample.csproj b/samples/SimpleServiceSample/SimpleServiceSample.csproj index 9890c70..0523bce 100644 --- a/samples/SimpleServiceSample/SimpleServiceSample.csproj +++ b/samples/SimpleServiceSample/SimpleServiceSample.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 false @@ -10,9 +10,9 @@ - - - + + + diff --git a/samples/WebApplicationSample/WebApplicationSample.csproj b/samples/WebApplicationSample/WebApplicationSample.csproj index ff0965f..c0ac230 100644 --- a/samples/WebApplicationSample/WebApplicationSample.csproj +++ b/samples/WebApplicationSample/WebApplicationSample.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj b/src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj index 12ff5b6..50bca20 100644 --- a/src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj +++ b/src/Serilog.Extensions.Hosting/Serilog.Extensions.Hosting.csproj @@ -5,7 +5,7 @@ Microsoft;Serilog Contributors - net462;netstandard2.0;netstandard2.1;net8.0;net9.0 + net462;netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0 serilog;aspnet;aspnetcore;hosting icon.png https://github.com/serilog/serilog-extensions-hosting @@ -26,18 +26,22 @@ $(DefineConstants);FEATURE_MBPW + + $(DefineConstants);FEATURE_MBPW + + - + - - - - + + + + diff --git a/test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj b/test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj index 2d764f6..d6aaac7 100644 --- a/test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj +++ b/test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj @@ -1,9 +1,7 @@  - - net4.8;net6.0;net8.0;net9.0 + net4.8;net8.0;net9.0;net10.0 false @@ -12,10 +10,10 @@ - - + + - +