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.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 d406e252..7ac35563 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,9 +8,9 @@ - + - + diff --git a/global.json b/global.json index d5209a8f..93aa8f40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.304", + "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 c3f3fa9a..5bf32561 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;net8.0;net472 xunit v3 Logging Extensions @@ -19,6 +19,9 @@ + + + diff --git a/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj b/src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj index 5350e3d9..e9a97eae 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