Added support for EF Core 10 on .NET 10

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.2.4",
+      "version": "2025.3.0.2",
       "commands": [
         "jb"
       ],
@@ -17,14 +17,14 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.4.17",
+      "version": "5.5.0",
       "commands": [
         "reportgenerator"
       ],
       "rollForward": false
     },
     "docfx": {
-      "version": "2.78.2",
+      "version": "2.78.4",
       "commands": [
         "docfx"
       ],

.github/workflows/build.yml

@@ -23,6 +23,7 @@ concurrency:
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
+  SOLUTION_FILE: JsonApiDotNetCore.sln
 
 jobs:
   build-and-test:
@@ -48,6 +49,7 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Show installed versions
       shell: pwsh
       run: |
@@ -123,12 +125,14 @@ jobs:
         # This contains the git tag name on release; in that case, we build the docs without publishing them.
         DOCFX_SOURCE_BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
       run: |
+        $ErrorActionPreference = "Stop"
+        $PSNativeCommandUseErrorActionPreference = $true
         cd docs
+        $zipFile = [IO.Path]::Combine($env:TEMP, 'docfx-net10-binaries.zip')
+        Invoke-WebRequest -Uri 'https://github.com/json-api-dotnet/docfx/raw/refs/heads/dotnet10-rtm/net10-binaries.zip' -Method 'GET' -OutFile $zipFile
+        Expand-Archive $zipFile -Force
         & ./generate-examples.ps1
-        dotnet docfx docfx.json --warningsAsErrors true
-        if ($LastExitCode -ne 0) {
-            Write-Error "docfx failed with exit code $LastExitCode."
-        }
+        dotnet exec docfx-net10-binaries/docfx.dll docfx.json --warningsAsErrors true
         Copy-Item CNAME _site/CNAME
         Copy-Item home/*.html _site/
         Copy-Item home/*.ico _site/
@@ -159,6 +163,7 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
       uses: actions/checkout@v5
     - name: Restore tools
@@ -168,7 +173,8 @@ jobs:
       run: |
         $inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
         Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+        dotnet jb inspectcode --version
+        dotnet jb inspectcode $env:SOLUTION_FILE --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --properties:RunAnalyzers=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
     - name: Upload output to artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -218,6 +224,7 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
       uses: actions/checkout@v5
       with:
@@ -236,13 +243,15 @@ jobs:
         $baseCommitHash = git rev-parse HEAD~1
 
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
-        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
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $env:SOLUTION_FILE --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
     - name: CleanupCode (on branch)
       if: ${{ github.event_name == 'push' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
       shell: pwsh
       run: |
         Write-Output 'Running code cleanup on all files.'
-        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN --fail-on-diff --print-diff
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN --fail-on-diff --print-diff
 
   publish:
     timeout-minutes: 60

.github/workflows/codeql.yml

@@ -28,6 +28,7 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
       uses: actions/checkout@v5
     - name: Initialize CodeQL

.github/workflows/qodana.yml

@@ -27,6 +27,7 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
       uses: actions/checkout@v5
       with:

.gitignore

@@ -423,6 +423,3 @@ FodyWeavers.xsd
 **/.idea/**/httpRequests/
 **/.idea/**/dataSources/
 !**/.idea/**/codeStyles/*
-
-# Workaround for https://github.com/microsoft/kiota/issues/4228
-kiota-lock.json

Build.ps1

@@ -1,8 +1,6 @@
-function VerifySuccessExitCode {
-    if ($LastExitCode -ne 0) {
-        throw "Command failed with exit code $LastExitCode."
-    }
-}
+#Requires -Version 7.4
+$ErrorActionPreference = "Stop"
+$PSNativeCommandUseErrorActionPreference = $true
 
 Write-Host "$(pwsh --version)"
 Write-Host ".NET SDK $(dotnet --version)"
@@ -11,16 +9,7 @@ Remove-Item -Recurse -Force artifacts -ErrorAction SilentlyContinue
 Remove-Item -Recurse -Force * -Include coverage.cobertura.xml
 
 dotnet tool restore
-VerifySuccessExitCode
-
 dotnet build --configuration Release
-VerifySuccessExitCode
-
 dotnet test --no-build --configuration Release --verbosity quiet --collect:"XPlat Code Coverage"
-VerifySuccessExitCode
-
 dotnet reportgenerator -reports:**\coverage.cobertura.xml -targetdir:artifacts\coverage -filefilters:-*.g.cs
-VerifySuccessExitCode
-
 dotnet pack --no-build --configuration Release --output artifacts/packages
-VerifySuccessExitCode

Directory.Build.props

@@ -12,7 +12,16 @@
     <VersionPrefix>5.9.2</VersionPrefix>
     <VersionSuffix>pre</VersionSuffix>
     <OpenApiPreviewNumber>7</OpenApiPreviewNumber>
-    <NuGetAuditMode>direct</NuGetAuditMode>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>
+      <!--
+        Temporary workaround: Stable EF Core 10 package for Pomelo.EntityFrameworkCore.MySql is not available yet.
+        NU1608: Detected package version outside of dependency constraint
+      -->
+      $(NoWarn);NU1608
+    </NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>

Directory.Build.targets

@@ -0,0 +1,18 @@
+<Project>
+  <Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'Microsoft.AspNetCore.OpenApi.SourceGenerators'" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Workaround for compiler regression at https://github.com/dotnet/roslyn/issues/80756 -->
+  <Target Name="DisableSlowAnalyzers" Condition="'$(Configuration)' == 'Debug'" BeforeTargets="CoreCompile">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'CSharpGuidelinesAnalyzer'" />
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'Microsoft.CodeAnalysis.CSharp.CodeStyle'" />
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'Microsoft.CodeAnalysis.NetAnalyzers'" />
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'Microsoft.CodeAnalysis.CSharp.NetAnalyzers'" />
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Filename)' == 'xunit.analyzers'" />
+    </ItemGroup>
+  </Target>
+</Project>

JsonApiDotNetCore.sln.DotSettings

@@ -72,8 +72,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantOverload_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantQueryOrderByAscendingKeyword/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantToStringCallForValueType/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeArgumentsInsideNameof/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveConstructorInvocation/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSequenceEqualWithConstantPattern/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFieldKeyword/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithPrimaryConstructorParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyStringComparison/@EntryIndexedValue">WARNING</s:String>

README.md

@@ -219,23 +219,17 @@ The following links explain what this project provides, why it exists, and how y
 The following chart should help you pick the best version, based on your environment.
 See also our [versioning policy](./VERSIONING_POLICY.md).
 
-| JsonApiDotNetCore | Status       | .NET     | Entity Framework Core |
-| ----------------- | ------------ | -------- | --------------------- |
-| master            | Preview      | 9        | 9                     |
-|                   |              | 8        | 8, 9                  |
-| 5.7.0+            | Stable       | 9        | 9                     |
-|                   |              | 8        | 8, 9                  |
-| 5.5.0-5.6.0       | Stable       | 9        | 9                     |
-|                   |              | 8        | 8, 9                  |
-|                   |              | 7        | 7                     |
-|                   |              | 6        | 6, 7                  |
-| 5.0.3-5.4.0       | Stable       | 7        | 7                     |
-|                   |              | 6        | 6, 7                  |
-| 5.0.0-5.0.2       | Stable       | 6        | 6                     |
-| 4.x               | Stable       | 6        | 5                     |
-|                   |              | 5        | 5                     |
-|                   |              | Core 3.1 | 3.1, 5                |
-| 3.x               | Stable       | Core 2.x | 2.x                   |
+| .NET     | Entity Framework Core | JsonApiDotNetCore | Status         |
+| -------- | --------------------- | ----------------- | -------------- |
+| 10       | 10                    | master            | Preview        |
+| 9        | 9                     | 5.5.0+            | Stable         |
+| 8        | 8, 9                  | 5.5.0+            | Stable         |
+| 7        | 7                     | 5.0.3 - 5.6.0     | Out of support |
+| 6        | 7                     | 5.0.3 - 5.6.0     | Out of support |
+| 6        | 6                     | 5.0.0 - 5.6.0     | Out of support |
+| 5        | 5                     | 4.x               | Out of support |
+| Core 3.1 | 3.1, 5                | 4.x               | Out of support |
+| Core 2.x | 2.x                   | 3.x               | Out of support |
 
 ## Trying out the latest build
 

benchmarks/Benchmarks.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
 

cleanupcode.ps1

@@ -1,4 +1,4 @@
-#Requires -Version 7.0
+#Requires -Version 7.4
 
 # This script reformats (part of) the codebase to make it compliant with our coding guidelines.
 
@@ -7,38 +7,31 @@ param(
     [string] $revision
 )
 
-function VerifySuccessExitCode {
-    if ($LastExitCode -ne 0) {
-        throw "Command failed with exit code $LastExitCode."
-    }
-}
+$ErrorActionPreference = "Stop"
+$PSNativeCommandUseErrorActionPreference = $true
 
 dotnet tool restore
-VerifySuccessExitCode
-
 dotnet restore
-VerifySuccessExitCode
+
+$solutionFile = 'JsonApiDotNetCore.sln'
 
 if ($revision) {
     $headCommitHash = git rev-parse HEAD
-    VerifySuccessExitCode
-
     $baseCommitHash = git rev-parse $revision
-    VerifySuccessExitCode
 
     if ($baseCommitHash -eq $headCommitHash) {
         Write-Output "Running code cleanup on staged/unstaged files."
-        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 staged,modified
-        VerifySuccessExitCode
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $solutionFile --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 staged,modified
     }
     else {
         Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files."
-        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 staged,modified,commits -a $headCommitHash -b $baseCommitHash
-        VerifySuccessExitCode
+        dotnet jb cleanupcode --version
+        dotnet regitlint -s $solutionFile --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 staged,modified,commits -a $headCommitHash -b $baseCommitHash
     }
 }
 else {
     Write-Output "Running code cleanup on all files."
-    dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN
-    VerifySuccessExitCode
+    dotnet jb cleanupcode --version
+    dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --verbosity=WARN
 }

docs/.gitignore

@@ -3,3 +3,4 @@ api/*.yml
 api/.manifest
 request-examples/*.json
 request-examples/*.temp
+docfx-net10-binaries/