Merge branch 'master' into fix/1056-openapi-capabilities

Author: mrnlts

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.2.4",
+      "version": "2025.3.1",
       "commands": [
         "jb"
       ],
@@ -17,14 +17,14 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.4.17",
+      "version": "5.5.1",
       "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,14 +49,17 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Show installed versions
       shell: pwsh
       run: |
         Write-Host "$(pwsh --version) is installed at $PSHOME"
         psql --version
         Write-Host "Active .NET SDK: $(dotnet --version)"
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Restore tools
       run: dotnet tool restore
     - name: Restore packages
@@ -100,7 +104,7 @@ jobs:
         Logging__LogLevel__Microsoft.Extensions.Hosting.Internal.Host: 'None'
         Logging__LogLevel__Microsoft.EntityFrameworkCore.Database.Command: 'None'
         Logging__LogLevel__JsonApiDotNetCore: 'None'
-      run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;summary.includeSkippedTests=true"
+      run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --logger "GitHubActions;annotations-title=@test (@framework);annotations-message=@error\n@trace;summary-include-passed=false"
     - name: Upload coverage to codecov.io
       if: ${{ matrix.os == 'ubuntu-latest' }}
       env:
@@ -113,7 +117,7 @@ jobs:
       run: dotnet pack --no-build --configuration Release --output ${{ github.workspace }}/artifacts/packages /p:VersionSuffix=${{ env.PACKAGE_VERSION_SUFFIX }}
     - name: Upload packages to artifacts
       if: ${{ matrix.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: packages
         path: artifacts/packages
@@ -123,20 +127,22 @@ 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/
         New-Item -Force _site/styles -ItemType Directory | Out-Null
         Copy-Item -Recurse home/assets/* _site/styles/
     - name: Upload documentation to artifacts
       if: ${{ matrix.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: documentation
         path: docs/_site
@@ -159,18 +165,22 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Restore tools
       run: dotnet tool restore
     - name: InspectCode
       shell: pwsh
       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 --no-updates --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --format="xml" --settings=WarningSeverities.DotSettings --properties:"Configuration=Release;RunAnalyzers=false;NuGetAudit=false;ContinuousIntegrationBuild=false" --severity=WARNING --verbosity=WARN --disable-settings-layers="GlobalAll;GlobalPerProduct;SolutionPersonal;ProjectPersonal"
     - name: Upload output to artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: InspectCode-${{ matrix.os }}
         path: ${{ env.INSPECT_CODE_OUTPUT_PATH }}
@@ -189,7 +199,7 @@ jobs:
                             $issueType = $xml.report.IssueTypes.SelectSingleNode("IssueType[@Id='$($_.TypeId)']")
                             $severity = $_.Severity ?? $issueType.Severity
 
-                            Write-Output "[$severity] $($_.File):$($_.Line) $($_.TypeId): $($_.Message)"
+                            Write-Output "[$severity] ($($_.TargetFramework)) $($_.File):$($_.Line) $($_.TypeId): $($_.Message)"
                         })
                     })
                 }
@@ -201,7 +211,7 @@ jobs:
         }
 
   cleanup-code:
-    timeout-minutes: 60
+    timeout-minutes: 90
     strategy:
       fail-fast: false
       matrix:
@@ -218,14 +228,18 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
+        persist-credentials: false
         fetch-depth: 2
     - name: Restore tools
       run: dotnet tool restore
     - name: Restore packages
-      run: dotnet restore
+      run: dotnet restore /p:NuGetAudit=false
+    - name: Build
+      run: dotnet build --no-restore --configuration Release /p:RunAnalyzers=false
     - name: CleanupCode (on PR diff)
       if: ${{ github.event_name == 'pull_request' }}
       shell: pwsh
@@ -236,13 +250,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 --no-updates --jb --properties:"Configuration=Release;RunAnalyzers=false;NuGetAudit=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 --no-updates --jb --properties:"Configuration=Release;RunAnalyzers=false;NuGetAudit=false" --jb --verbosity=WARN --fail-on-diff --print-diff
 
   publish:
     timeout-minutes: 60
@@ -261,12 +277,12 @@ jobs:
       if: ${{ github.event_name == 'push' || github.event_name == 'release' }}
       run: |
         dotnet nuget add source --username 'json-api-dotnet' --password '${{ secrets.GITHUB_TOKEN }}' --store-password-in-clear-text --name 'github' 'https://nuget.pkg.github.com/json-api-dotnet/index.json'
-        dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.GITHUB_TOKEN }}' --source 'github'
+        dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.GITHUB_TOKEN }}' --source 'github' --skip-duplicate
     - name: Publish to feedz.io
       if: ${{ github.event_name == 'push' || github.event_name == 'release' }}
       run: |
         dotnet nuget add source --name 'feedz-io' 'https://f.feedz.io/json-api-dotnet/jsonapidotnetcore/nuget/index.json'
-        dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.FEEDZ_IO_API_KEY }}' --source 'feedz-io'
+        dotnet nuget push '${{ github.workspace }}/packages/*.nupkg' --api-key '${{ secrets.FEEDZ_IO_API_KEY }}' --source 'feedz-io' --skip-duplicate
     - name: Publish documentation
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       uses: peaceiris/actions-gh-pages@v4

.github/workflows/codeql.yml

@@ -28,8 +28,11 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4
       with:

.github/workflows/deps-review.yml

@@ -8,7 +8,9 @@ jobs:
   dependency-review:
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v5
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4
+    - name: 'Checkout Repository'
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - name: 'Dependency Review'
+      uses: actions/dependency-review-action@v4

.github/workflows/qodana.yml

@@ -27,15 +27,17 @@ jobs:
         dotnet-version: |
           8.0.*
           9.0.*
+          10.0.*
     - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
+        persist-credentials: false
         ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
         fetch-depth: 0  # a full history is required for pull request analysis
     - name: Restore tools
       run: dotnet tool restore
     - name: Restore packages
-      run: dotnet restore
+      run: dotnet restore /p:NuGetAudit=false
     - name: Build
       run: dotnet build --no-restore --configuration Release
     - name: Qodana scan

.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

@@ -9,10 +9,19 @@
     <AnalysisMode>Recommended</AnalysisMode>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
-    <VersionPrefix>5.9.2</VersionPrefix>
+    <VersionPrefix>5.10.1</VersionPrefix>
     <VersionSuffix>pre</VersionSuffix>
-    <OpenApiPreviewNumber>7</OpenApiPreviewNumber>
-    <NuGetAuditMode>direct</NuGetAuditMode>
+    <OpenApiPreviewNumber>8</OpenApiPreviewNumber>
+  </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>

JetBrainsInspectCodeTransform.xslt

@@ -24,6 +24,7 @@
           <table style="width:100%">
             <tr>
               <th>File</th>
+              <th>Target Framework</th>
               <th>Line Number</th>
               <th>Type</th>
               <th>Message</th>
@@ -33,6 +34,9 @@
                 <td>
                   <xsl:value-of select="@File"/>
                 </td>
+                <td>
+                  <xsl:value-of select="@TargetFramework"/>
+                </td>
                 <td>
                   <xsl:value-of select="@Line"/>
                 </td>