From c5ae8cabba9400e4f9e1552543a62dc3bd5040c5 Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 6 Aug 2025 02:38:19 +0200
Subject: [PATCH 1/2] Package updates
---
.config/dotnet-tools.json | 4 ++--
Directory.Build.props | 2 +-
package-versions.props | 7 ++++---
.../JsonApiDotNetCore.Annotations.csproj | 2 ++
.../JsonApiEndpointsCopy.cs | 3 +++
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b665b78a1a..73a68f9261 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"jetbrains.resharper.globaltools": {
- "version": "2025.1.4",
+ "version": "2025.1.5",
"commands": [
"jb"
],
@@ -17,7 +17,7 @@
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
- "version": "5.4.7",
+ "version": "5.4.11",
"commands": [
"reportgenerator"
],
diff --git a/Directory.Build.props b/Directory.Build.props
index 1ef255f56e..952094cac8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -54,7 +54,7 @@
-
+
diff --git a/package-versions.props b/package-versions.props
index 4344ce16e2..e77a2ae86b 100644
--- a/package-versions.props
+++ b/package-versions.props
@@ -4,8 +4,9 @@
4.1.0
0.4.1
2.14.1
- 9.0.1
13.0.3
+ 9.0.3
+ 4.3.1
0.15.*
@@ -21,10 +22,10 @@
9.0.*
9.0.*
0.9.*
- 14.4.*
+ 14.5.*
13.0.*
4.1.*
- 2.4.*
+ 2.6.*
9.*-*
9.0.*
17.14.*
diff --git a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
index ed36e0797c..d615476081 100644
--- a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
+++ b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
@@ -46,5 +46,7 @@
+
diff --git a/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
index 911be3f359..56e924317d 100644
--- a/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
+++ b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
@@ -1,6 +1,9 @@
+using JetBrains.Annotations;
+
namespace JsonApiDotNetCore.SourceGenerators;
// IMPORTANT: A copy of this type exists in the JsonApiDotNetCore project. Keep these in sync when making changes.
+[PublicAPI]
[Flags]
public enum JsonApiEndpointsCopy
{
From fcd60bdf9524fc01d546c2aeba52d6cb7144112f Mon Sep 17 00:00:00 2001
From: Bart Koelman <10324372+bkoelman@users.noreply.github.com>
Date: Wed, 6 Aug 2025 12:38:03 +0200
Subject: [PATCH 2/2] Upload InspectCode output to artefacts
---
.github/workflows/build.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c7db60d2d..e3391b6202 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,6 +169,11 @@ jobs:
$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
+ - name: Upload output to artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: InspectCode-${{ matrix.os }}
+ path: ${{ env.INSPECT_CODE_OUTPUT_PATH }}
- name: Verify outcome
shell: pwsh
run: |