From 82fd05839503cfe6cfdc428a445fb75770558caa Mon Sep 17 00:00:00 2001 From: martincostello Date: Fri, 18 Apr 2025 15:14:49 +0100 Subject: [PATCH 1/9] Update to .NET 10 Update to .NET 10 with .NET SDK version 10.0.100-preview.3.25201.16. Co-Authored-By: costellobot <102549341+costellobot@users.noreply.github.com> --- .vsconfig | 2 +- Directory.Packages.props | 2 +- global.json | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 5 ++++- src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj | 5 ++++- .../MartinCostello.Logging.XUnit.Tests.csproj | 2 +- .../MartinCostello.Logging.XUnit.v3.Tests.csproj | 2 +- tests/SampleApp/SampleApp.csproj | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.vsconfig b/.vsconfig index 8114a325..f9ba009d 100644 --- a/.vsconfig +++ b/.vsconfig @@ -3,7 +3,7 @@ "components": [ "Microsoft.VisualStudio.Component.CoreEditor", "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.NetCore.Component.Runtime.9.0", + "Microsoft.NetCore.Component.Runtime.10.0", "Microsoft.NetCore.Component.SDK", "Microsoft.VisualStudio.Component.Roslyn.Compiler", "Microsoft.VisualStudio.Component.Roslyn.LanguageServices" diff --git a/Directory.Packages.props b/Directory.Packages.props index d406e252..48bc687e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ - + diff --git a/global.json b/global.json index d5209a8f..b1ee16d5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.304", + "version": "10.0.100-preview.3.25201.16", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index c3f3fa9a..fc534f67 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -9,7 +9,7 @@ Library MartinCostello.Logging.XUnit.v3 MartinCostello.Logging.XUnit - net8.0;net472 + net8.0;net472;net10.0 xunit v3 Logging Extensions @@ -22,6 +22,9 @@ + + + <_Parameter1>ed8d1c5e-3ee7-45fe-8d1d-94257a71f02a diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj index 5350e3d9..92c39f83 100644 --- a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj +++ b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj @@ -8,7 +8,7 @@ Library MartinCostello.Logging.XUnit MartinCostello.Logging.XUnit - netstandard2.0;net8.0 + net10.0;net8.0;netstandard2.0 xunit Logging Extensions @@ -19,6 +19,9 @@ + + + diff --git a/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj b/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj index 64bcb80e..10cb8167 100644 --- a/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj +++ b/tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj @@ -4,7 +4,7 @@ false $(NoWarn);CA1873 MartinCostello.Logging.XUnit - net9.0 + net10.0 true diff --git a/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj b/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj index 53186f9d..b01eada2 100644 --- a/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj +++ b/tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj @@ -6,7 +6,7 @@ $(NoWarn);CA1873 Exe MartinCostello.Logging.XUnit - net9.0 + net10.0 true diff --git a/tests/SampleApp/SampleApp.csproj b/tests/SampleApp/SampleApp.csproj index 9335bc40..e543c3e5 100644 --- a/tests/SampleApp/SampleApp.csproj +++ b/tests/SampleApp/SampleApp.csproj @@ -2,7 +2,7 @@ false $(NoWarn);CA1801;CA1822;CA1861;SA1600;SA1601 - net9.0 + net10.0 From 496a84d64ce064107a49e56ce43429b03a57424e Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Tue, 13 May 2025 20:02:10 +0100 Subject: [PATCH 2/9] Update .NET SDK to 10.0.100-preview.4.25258.110 (#920) * Update .NET SDK Update .NET SDK to version 10.0.100-preview.4.25258.110. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-version: 10.0.100-preview.4.25258.110 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 10.0.100-preview.4.25258.110 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 10.0.0-preview.3.25172.1 to 10.0.0-preview.4.25258.110. Bumps Microsoft.Extensions.Logging from 10.0.0-preview.3.25171.5 to 10.0.0-preview.4.25258.110. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-version: 10.0.0-preview.4.25258.110 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging dependency-version: 10.0.0-preview.4.25258.110 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --------- Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 48bc687e..a46bc945 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ - + diff --git a/global.json b/global.json index b1ee16d5..1d923557 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.3.25201.16", + "version": "10.0.100-preview.4.25258.110", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index fc534f67..c6ca0dab 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -23,7 +23,7 @@ - + From 6da824358fbc9b25fd63f81fec07b24f7405a98a Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Tue, 10 Jun 2025 18:24:47 +0100 Subject: [PATCH 3/9] Update .NET SDK to 10.0.100-preview.5.25277.114 (#939) * Update .NET SDK Update .NET SDK to version 10.0.100-preview.5.25277.114. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-version: 10.0.100-preview.5.25277.114 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 10.0.100-preview.5.25277.114 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 10.0.0-preview.4.25258.110 to 10.0.0-preview.5.25277.114. Bumps Microsoft.Extensions.Logging from 10.0.0-preview.4.25258.110 to 10.0.0-preview.5.25277.114. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-version: 10.0.0-preview.5.25277.114 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging dependency-version: 10.0.0-preview.5.25277.114 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --------- Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a46bc945..b131fc9a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ - + diff --git a/global.json b/global.json index 1d923557..4ae9eca5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.4.25258.110", + "version": "10.0.100-preview.5.25277.114", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index c6ca0dab..d094b1a8 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -23,7 +23,7 @@ - + From e2581a86ab5abc1280c8d32fbc57dedf7b91d5e8 Mon Sep 17 00:00:00 2001 From: martincostello Date: Mon, 16 Jun 2025 14:25:11 +0100 Subject: [PATCH 4/9] Updates for rebase Fix-up package references. --- Directory.Packages.props | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b131fc9a..44d616c1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index d094b1a8..fa932a89 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -19,12 +19,12 @@ + + + - - - <_Parameter1>ed8d1c5e-3ee7-45fe-8d1d-94257a71f02a From 27eab87f6a7b896d44a6f55c711ec0fe14588dae Mon Sep 17 00:00:00 2001 From: martincostello Date: Mon, 16 Jun 2025 14:39:36 +0100 Subject: [PATCH 5/9] Reorder TFMs Put `net10.0` first. --- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index fa932a89..0b6f01be 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -9,7 +9,7 @@ Library MartinCostello.Logging.XUnit.v3 MartinCostello.Logging.XUnit - net8.0;net472;net10.0 + net10.0;net8.0;net472 xunit v3 Logging Extensions From 5d77e80fdcb60e9dbaf3b780d5e5b9fb85093b99 Mon Sep 17 00:00:00 2001 From: martincostello Date: Tue, 15 Jul 2025 18:22:58 +0100 Subject: [PATCH 6/9] Update to .NET 10 preview 6 Update to preview 6 of .NET 10. --- Directory.Build.props | 2 ++ Directory.Packages.props | 4 ++-- global.json | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 2 +- src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj | 2 +- tests/Shared/Examples.cs | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bdb3c864..a70b629d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,6 +3,8 @@ false $(MSBuildThisFileDirectory)Logging.XUnit.ruleset true + + $(NoWarn);NU5104 direct xunit;logging true diff --git a/Directory.Packages.props b/Directory.Packages.props index 44d616c1..ae5a6a5d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,9 +8,9 @@ - + - + diff --git a/global.json b/global.json index 4ae9eca5..f1b5de63 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.5.25277.114", + "version": "10.0.100-preview.6.25358.103", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index 0b6f01be..093c1651 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj index 92c39f83..5824a6ca 100644 --- a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj +++ b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj @@ -20,7 +20,7 @@ - + diff --git a/tests/Shared/Examples.cs b/tests/Shared/Examples.cs index f2213ef1..57255bcb 100644 --- a/tests/Shared/Examples.cs +++ b/tests/Shared/Examples.cs @@ -6,6 +6,8 @@ namespace MartinCostello.Logging.XUnit; +#pragma warning disable CA1873 + public class Examples(ITestOutputHelper outputHelper) { [Fact] From 378ae3f6d005554e65f40d4ca0e8a792ff40db1e Mon Sep 17 00:00:00 2001 From: martincostello Date: Tue, 15 Jul 2025 18:57:00 +0100 Subject: [PATCH 7/9] Remove suppression Now configured in the project file. --- tests/Shared/Examples.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Shared/Examples.cs b/tests/Shared/Examples.cs index 57255bcb..f2213ef1 100644 --- a/tests/Shared/Examples.cs +++ b/tests/Shared/Examples.cs @@ -6,8 +6,6 @@ namespace MartinCostello.Logging.XUnit; -#pragma warning disable CA1873 - public class Examples(ITestOutputHelper outputHelper) { [Fact] From f7f3c3035e112f0be6ce35331e0e957174bab05a Mon Sep 17 00:00:00 2001 From: costellobot <102549341+costellobot@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:54:15 +0100 Subject: [PATCH 8/9] Update .NET SDK to 10.0.100-preview.7.25380.108 (#992) * Update .NET SDK Update .NET SDK to version 10.0.100-preview.7.25380.108. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-version: 10.0.100-preview.7.25380.108 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 10.0.100-preview.7.25380.108 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 10.0.0-preview.6.25358.103 to 10.0.0-preview.7.25380.108. Bumps Microsoft.Extensions.Logging from 10.0.0-preview.6.25358.103 to 10.0.0-preview.7.25380.108. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-version: 10.0.0-preview.7.25380.108 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Logging dependency-version: 10.0.0-preview.7.25380.108 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --------- Signed-off-by: costellobot <102549341+costellobot@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj | 2 +- src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ae5a6a5d..cf3060dc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ - + diff --git a/global.json b/global.json index f1b5de63..93aa8f40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.6.25358.103", + "version": "10.0.100-preview.7.25380.108", "allowPrerelease": false, "rollForward": "latestMajor", "paths": [ ".dotnet", "$host$" ], diff --git a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj index 093c1651..5bf32561 100644 --- a/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj +++ b/src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj index 5824a6ca..e9a97eae 100644 --- a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj +++ b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj @@ -20,7 +20,7 @@ - + From 93557e811781dc3880976d2a36da0252fbc87b66 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Tue, 12 Aug 2025 21:14:42 +0100 Subject: [PATCH 9/9] Update NuGet packages Update NuGet packages for .NET 10 preview 7. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cf3060dc..7ac35563 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - +