Skip to content

Update to .NET 10 #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Update to .NET 10 #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82fd058
Update to .NET 10
martincostello Apr 18, 2025
496a84d
Update .NET SDK to 10.0.100-preview.4.25258.110 (#920)
costellobot May 13, 2025
6da8243
Update .NET SDK to 10.0.100-preview.5.25277.114 (#939)
costellobot Jun 10, 2025
e2581a8
Updates for rebase
martincostello Jun 16, 2025
27eab87
Reorder TFMs
martincostello Jun 16, 2025
5d77e80
Update to .NET 10 preview 6
martincostello Jul 15, 2025
378ae3f
Remove suppression
martincostello Jul 15, 2025
f7f3c30
Update .NET SDK to 10.0.100-preview.7.25380.108 (#992)
costellobot Aug 12, 2025
93557e8
Update NuGet packages
martincostello Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<AssemblyIsCLSCompliant>false</AssemblyIsCLSCompliant>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Logging.XUnit.ruleset</CodeAnalysisRuleSet>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<!-- TODO Remove when .NET 10 is stable -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
<NuGetAuditMode>direct</NuGetAuditMode>
<PackageTags>xunit;logging</PackageTags>
<UseArtifactsOutput>true</UseArtifactsOutput>
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.7.25380.108" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25380.108" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="ReportGenerator" Version="5.4.11" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.304",
"version": "10.0.100-preview.7.25380.108",
"allowPrerelease": false,
"rollForward": "latestMajor",
"paths": [ ".dotnet", "$host$" ],
Expand Down
5 changes: 4 additions & 1 deletion src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<PackageId>MartinCostello.Logging.XUnit.v3</PackageId>
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net10.0;net8.0;net472</TargetFrameworks>
<Title>xunit v3 Logging Extensions</Title>
</PropertyGroup>
<ItemGroup>
Expand All @@ -19,6 +19,9 @@
<PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="[8.0.1,)" />
<PackageReference Include="xunit.v3.extensibility.core" VersionOverride="[2.0.1,)" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
<PackageReference Update="Microsoft.Extensions.Logging" VersionOverride="10.0.0-preview.7.25380.108" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
</ItemGroup>
Expand Down
5 changes: 4 additions & 1 deletion src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<PackageId>MartinCostello.Logging.XUnit</PackageId>
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
<Title>xunit Logging Extensions</Title>
</PropertyGroup>
<ItemGroup>
Expand All @@ -19,6 +19,9 @@
<PackageReference Include="xunit.abstractions" VersionOverride="[2.0.3,)" />
<PackageReference Include="xunit.extensibility.execution" VersionOverride="[2.6.6,)" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
<PackageReference Update="Microsoft.Extensions.Logging" VersionOverride="10.0.0-preview.7.25380.108" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
<NoWarn>$(NoWarn);CA1873</NoWarn>
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UseDefaultCodeAnalysisRuleSet>true</UseDefaultCodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<NoWarn>$(NoWarn);CA1873</NoWarn>
<OutputType>Exe</OutputType>
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<UseDefaultCodeAnalysisRuleSet>true</UseDefaultCodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/SampleApp/SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);CA1801;CA1822;CA1861;SA1600;SA1601</NoWarn>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Using Remove="Xunit" />
Expand Down
Loading