Skip to content

Commit e287410

Browse files
Update to .NET 10
Update to .NET 10 with .NET SDK version 10.0.100-preview.3.25201.16. Co-Authored-By: costellobot <[email protected]>
1 parent 8c08903 commit e287410

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed

.vsconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"components": [
44
"Microsoft.VisualStudio.Component.CoreEditor",
55
"Microsoft.VisualStudio.Workload.CoreEditor",
6-
"Microsoft.NetCore.Component.Runtime.9.0",
6+
"Microsoft.NetCore.Component.Runtime.10.0",
77
"Microsoft.NetCore.Component.SDK",
88
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
99
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices"

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
99
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
1010
<PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
11-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.3.25172.1" />
1212
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
1313
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.7" />
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.303",
3+
"version": "10.0.100-preview.3.25201.16",
44
"allowPrerelease": false,
55
"rollForward": "latestMajor",
66
"paths": [ ".dotnet", "$host$" ],

src/Logging.XUnit.v3/MartinCostello.Logging.XUnit.v3.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<PackageId>MartinCostello.Logging.XUnit.v3</PackageId>
1111
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
12-
<TargetFrameworks>net8.0;net472</TargetFrameworks>
12+
<TargetFrameworks>net8.0;net472;net10.0</TargetFrameworks>
1313
<Title>xunit v3 Logging Extensions</Title>
1414
</PropertyGroup>
1515
<ItemGroup>
@@ -22,6 +22,9 @@
2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
2424
</ItemGroup>
25+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
26+
<PackageReference Update="Microsoft.Extensions.Logging" VersionOverride="10.0.0-preview.3.25171.5" />
27+
</ItemGroup>
2528
<ItemGroup>
2629
<AssemblyAttribute Include="System.Runtime.InteropServices.GuidAttribute">
2730
<_Parameter1>ed8d1c5e-3ee7-45fe-8d1d-94257a71f02a</_Parameter1>

src/Logging.XUnit/MartinCostello.Logging.XUnit.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>Library</OutputType>
99
<PackageId>MartinCostello.Logging.XUnit</PackageId>
1010
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
11-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
11+
<TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
1212
<Title>xunit Logging Extensions</Title>
1313
</PropertyGroup>
1414
<ItemGroup>
@@ -19,6 +19,9 @@
1919
<PackageReference Include="xunit.abstractions" VersionOverride="[2.0.3,)" />
2020
<PackageReference Include="xunit.extensibility.execution" VersionOverride="[2.4.1,)" />
2121
</ItemGroup>
22+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
23+
<PackageReference Update="Microsoft.Extensions.Logging" VersionOverride="[10.0.0-preview.5.25277.114,)" />
24+
</ItemGroup>
2225
<ItemGroup>
2326
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
2427
</ItemGroup>

tests/Logging.XUnit.Tests/MartinCostello.Logging.XUnit.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
55
<NoWarn>$(NoWarn);CA1873</NoWarn>
66
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
7-
<TargetFramework>net9.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
<UseDefaultCodeAnalysisRuleSet>true</UseDefaultCodeAnalysisRuleSet>
99
</PropertyGroup>
1010
<ItemGroup>

tests/Logging.XUnit.v3.Tests/MartinCostello.Logging.XUnit.v3.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<NoWarn>$(NoWarn);CA1873</NoWarn>
77
<OutputType>Exe</OutputType>
88
<RootNamespace>MartinCostello.Logging.XUnit</RootNamespace>
9-
<TargetFramework>net9.0</TargetFramework>
9+
<TargetFramework>net10.0</TargetFramework>
1010
<UseDefaultCodeAnalysisRuleSet>true</UseDefaultCodeAnalysisRuleSet>
1111
</PropertyGroup>
1212
<ItemGroup>

tests/SampleApp/SampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<NoWarn>$(NoWarn);CA1801;CA1822;CA1861;SA1600;SA1601</NoWarn>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
88
<Using Remove="Xunit" />

0 commit comments

Comments
 (0)