Skip to content

Commit 101dc3f

Browse files
bkoelmanbkoelman
committed
Build against .NET 10 preview
1 parent ba20f0f commit 101dc3f

File tree

32 files changed

+67
-30
lines changed

32 files changed

+67
-30
lines changed

‎.github/workflows/build.yml

+15
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ jobs:
4848
dotnet-version: |
4949
8.0.*
5050
9.0.*
51+
- name: Setup .NET 10 preview
52+
uses: actions/setup-dotnet@v4
53+
with:
54+
dotnet-version: 10.0.*
55+
dotnet-quality: 'preview'
5156
- name: Show installed versions
5257
shell: pwsh
5358
run: |
@@ -166,6 +171,11 @@ jobs:
166171
dotnet-version: |
167172
8.0.*
168173
9.0.*
174+
- name: Setup .NET 10 preview
175+
uses: actions/setup-dotnet@v4
176+
with:
177+
dotnet-version: 10.0.*
178+
dotnet-quality: 'preview'
169179
- name: Git checkout
170180
uses: actions/checkout@v4
171181
- name: Restore tools
@@ -221,6 +231,11 @@ jobs:
221231
dotnet-version: |
222232
8.0.*
223233
9.0.*
234+
- name: Setup .NET 10 preview
235+
uses: actions/setup-dotnet@v4
236+
with:
237+
dotnet-version: 10.0.*
238+
dotnet-quality: 'preview'
224239
- name: Git checkout
225240
uses: actions/checkout@v4
226241
with:

‎.github/workflows/codeql.yml

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ jobs:
2929
dotnet-version: |
3030
8.0.*
3131
9.0.*
32+
- name: Setup .NET 10 preview
33+
uses: actions/setup-dotnet@v4
34+
with:
35+
dotnet-version: 10.0.*
36+
dotnet-quality: 'preview'
3237
- name: Git checkout
3338
uses: actions/checkout@v4
3439
- name: Initialize CodeQL

‎Directory.Build.props

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<NuGetAuditMode>direct</NuGetAuditMode>
1616
</PropertyGroup>
1717

18+
<PropertyGroup>
19+
<!-- .NET 10 Preview -->
20+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
21+
<NoWarn>$(NoWarn);NU1903;NU5104;NU1608</NoWarn>
22+
</PropertyGroup>
23+
1824
<PropertyGroup>
1925
<!--
2026
Disabled IDE analyzers for "Use collection expression" because they are dangerous in a subtle way.

‎benchmarks/Benchmarks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
</PropertyGroup>
77

‎package-versions.props

+10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@
3030
<XunitVisualStudioVersion>2.8.*</XunitVisualStudioVersion>
3131
</PropertyGroup>
3232

33+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
34+
<!-- Published dependencies (only update on major version change) -->
35+
<EntityFrameworkCoreFrozenVersion>10.0.*-*</EntityFrameworkCoreFrozenVersion>
36+
37+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
38+
<AspNetCoreVersion>10.0.*-*</AspNetCoreVersion>
39+
<EntityFrameworkCoreVersion>10.0.*-*</EntityFrameworkCoreVersion>
40+
<EntityFrameworkCorePomeloVersion>9.0.*-*</EntityFrameworkCorePomeloVersion>
41+
</PropertyGroup>
42+
3343
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
3444
<!-- Published dependencies (only update on major version change) -->
3545
<EntityFrameworkCoreFrozenVersion>N/A</EntityFrameworkCoreFrozenVersion>

‎src/Examples/DapperExample/DapperExample.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />
@@ -14,6 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Dapper" Version="$(DapperVersion)" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
1718
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
1819
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1920
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCorePomeloVersion)" />

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/GettingStarted/GettingStarted.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<OpenApiGenerateDocumentsOnBuild>true</OpenApiGenerateDocumentsOnBuild>
55
<OpenApiDocumentsDirectory>GeneratedSwagger</OpenApiDocumentsDirectory>
66
</PropertyGroup>

‎src/Examples/MultiDbContextExample/MultiDbContextExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/OpenApiKiotaClientExample/OpenApiKiotaClientExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/OpenApiNSwagClientExample/OpenApiNSwagClientExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22
<PropertyGroup>
33
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<Import Project="..\..\..\package-versions.props" />

‎src/Examples/ReportsExample/ReportsExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\..\package-versions.props" />

‎src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;netstandard1.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net8.0;netstandard1.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<RootNamespace>JsonApiDotNetCore</RootNamespace>

‎src/JsonApiDotNetCore.OpenApi.Client.Kiota/JsonApiDotNetCore.OpenApi.Client.Kiota.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore.OpenApi.Client.NSwag/JsonApiDotNetCore.OpenApi.Client.NSwag.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore.OpenApi.Swashbuckle/JsonApiDotNetCore.OpenApi.Swashbuckle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
</PropertyGroup>

‎test/AnnotationTests/AnnotationTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0;netstandard2.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0;netstandard2.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/DapperTests/DapperTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/DiscoveryTests/DiscoveryTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />
@@ -18,6 +18,6 @@
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EntityFrameworkCoreVersion)" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EntityFrameworkCoreVersion)" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
21-
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
21+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'net8.0'" Version="$(SystemTextJsonVersion)" />
2222
</ItemGroup>
2323
</Project>

‎test/MultiDbContextTests/MultiDbContextTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/OpenApiKiotaEndToEndTests/OpenApiKiotaEndToEndTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/OpenApiNSwagClientTests/OpenApiNSwagClientTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<Import Project="..\..\package-versions.props" />

‎test/OpenApiNSwagEndToEndTests/OpenApiNSwagEndToEndTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<!-- TargetFrameworks does not work, see https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2706 -->
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<Import Project="..\..\package-versions.props" />

‎test/OpenApiTests/OpenApiTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<GenerateDocumentationFile>True</GenerateDocumentationFile>
55
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
66
<NoWarn>$(NoWarn);1591</NoWarn>

‎test/SourceGeneratorTests/SourceGeneratorTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/TestBuildingBlocks/TestBuildingBlocks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

‎test/UnitTests/UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />

0 commit comments

Comments
 (0)