Skip to content

Commit dedc89f

Browse files
bkoelmanbkoelman
committed
Try previews of .NET/EF 9
1 parent 7b5db17 commit dedc89f

File tree

23 files changed

+61
-26
lines changed

23 files changed

+61
-26
lines changed

‎.github/workflows/build.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
dotnet-version: |
4949
6.0.x
5050
8.0.x
51+
9.0.x
52+
dotnet-quality: 'preview'
5153
- name: Setup PowerShell (Ubuntu)
5254
if: matrix.os == 'ubuntu-latest'
5355
run: |
@@ -196,6 +198,8 @@ jobs:
196198
dotnet-version: |
197199
6.0.x
198200
8.0.x
201+
9.0.x
202+
dotnet-quality: 'preview'
199203
- name: Git checkout
200204
uses: actions/checkout@v4
201205
- name: Restore tools
@@ -251,6 +255,8 @@ jobs:
251255
dotnet-version: |
252256
6.0.x
253257
8.0.x
258+
9.0.x
259+
dotnet-quality: 'preview'
254260
- name: Git checkout
255261
uses: actions/checkout@v4
256262
with:
@@ -263,6 +269,9 @@ jobs:
263269
dotnet restore
264270
- name: CleanupCode (on PR diff)
265271
if: github.event_name == 'pull_request'
272+
env:
273+
# Workaround for https://github.com/dotnet/runtime/issues/64103
274+
COMPlus_ReadyToRun: 0
266275
shell: pwsh
267276
run: |
268277
# Not using the environment variables for SHAs, because they may be outdated. This may happen on force-push after the build is queued, but before it starts.
@@ -274,6 +283,9 @@ jobs:
274283
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
275284
- name: CleanupCode (on branch)
276285
if: github.event_name == 'push' || github.event_name == 'release'
286+
env:
287+
# Workaround for https://github.com/dotnet/runtime/issues/64103
288+
COMPlus_ReadyToRun: 0
277289
shell: pwsh
278290
run: |
279291
Write-Output "Running code cleanup on all files."

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
dotnet-version: |
3030
6.0.x
3131
8.0.x
32+
9.0.x
33+
dotnet-quality: 'preview'
3234
- name: Git checkout
3335
uses: actions/checkout@v4
3436
- name: Initialize CodeQL

‎Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1414
</PropertyGroup>
1515

16+
<PropertyGroup>
17+
<NoWarn>$(NoWarn);NU5104;NU1608</NoWarn>
18+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
19+
</PropertyGroup>
20+
1621
<ItemGroup>
1722
<PackageReference Include="JetBrains.Annotations" Version="2023.3.*" PrivateAssets="All" />
1823
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />

‎benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
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>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
</PropertyGroup>
77

‎package-versions.props

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,27 @@
1919
<XunitVersion>2.8.*</XunitVersion>
2020
</PropertyGroup>
2121

22+
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
23+
<!-- Published dependencies (only update on major version change) -->
24+
<EntityFrameworkCoreFrozenVersion>9.0.0-preview.3.24172.4</EntityFrameworkCoreFrozenVersion>
25+
26+
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
27+
<AspNetCoreVersion>9.0.*-*</AspNetCoreVersion>
28+
<EntityFrameworkCoreVersion>$(EntityFrameworkCoreFrozenVersion)</EntityFrameworkCoreVersion>
29+
<EntityFrameworkCorePostgreSQLVersion>9.0.0-preview.3</EntityFrameworkCorePostgreSQLVersion>
30+
<EntityFrameworkCorePomeloVersion>9.0.0-preview.1</EntityFrameworkCorePomeloVersion>
31+
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
32+
</PropertyGroup>
33+
2234
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
2335
<!-- Published dependencies (only update on major version change) -->
2436
<EntityFrameworkCoreFrozenVersion>8.0.0</EntityFrameworkCoreFrozenVersion>
2537

2638
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
2739
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
2840
<EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
41+
<EntityFrameworkCorePostgreSQLVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePostgreSQLVersion>
42+
<EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
2943
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
3044
</PropertyGroup>
3145

@@ -37,6 +51,8 @@
3751
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
3852
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
3953
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
54+
<EntityFrameworkCorePostgreSQLVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePostgreSQLVersion>
55+
<EntityFrameworkCorePomeloVersion>$(EntityFrameworkCoreVersion)</EntityFrameworkCorePomeloVersion>
4056
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
4157
</PropertyGroup>
4258
</Project>

‎src/Examples/DapperExample/DapperExample.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
44
</PropertyGroup>
55

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

88
<ItemGroup>
99
<ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
10-
<ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
11-
ReferenceOutputAssembly="false" />
10+
<ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
1211
</ItemGroup>
1312

1413
<ItemGroup>
1514
<PackageReference Include="Dapper" Version="$(DapperVersion)" />
1615
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
18-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
19-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCoreVersion)" />
18+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCorePostgreSQLVersion)" />
19+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCorePomeloVersion)" />
2020
</ItemGroup>
2121
</Project>

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

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

66
<Import Project="..\..\..\package-versions.props" />
@@ -13,6 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
16+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCorePostgreSQLVersion)" />
1717
</ItemGroup>
1818
</Project>

‎src/Examples/GettingStarted/GettingStarted.csproj

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

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

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

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

66
<Import Project="..\..\..\package-versions.props" />
@@ -13,6 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
16+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCorePostgreSQLVersion)" />
1717
</ItemGroup>
1818
</Project>

‎src/Examples/MultiDbContextExample/MultiDbContextExample.csproj

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

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

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

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

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

‎src/Examples/ReportsExample/ReportsExample.csproj

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

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

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

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

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
</PropertyGroup>

‎test/AnnotationTests/AnnotationTests.csproj

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

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

‎test/DapperTests/DapperTests.csproj

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

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

‎test/DiscoveryTests/DiscoveryTests.csproj

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

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

‎test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj

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

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

‎test/MultiDbContextTests/MultiDbContextTests.csproj

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

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

‎test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

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

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

‎test/SourceGeneratorTests/SourceGeneratorTests.csproj

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

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

‎test/TestBuildingBlocks/TestBuildingBlocks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<Import Project="..\..\package-versions.props" />
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCorePostgreSQLVersion)" />
2121
<PackageReference Include="xunit" Version="$(XunitVersion)" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" PrivateAssets="All" />
2323
</ItemGroup>

‎test/UnitTests/UnitTests.csproj

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

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

0 commit comments

Comments
 (0)