Skip to content

Commit ce21757

Browse files
authored
Update to JsonApiDotNetCore v5.11.0 (#186)
1 parent 85b4994 commit ce21757

27 files changed

Lines changed: 139 additions & 258 deletions

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2025.3.4",
6+
"version": "2026.1.2",
77
"commands": [
88
"jb"
99
],
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"dotnet-reportgenerator-globaltool": {
20-
"version": "5.5.4",
20+
"version": "5.5.10",
2121
"commands": [
2222
"reportgenerator"
2323
],

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ contact_links:
66
- name: Sponsor JsonApiDotNetCore
77
url: https://github.com/sponsors/json-api-dotnet
88
about: Help the continued development.
9-
- name: Ask on Gitter
10-
url: https://gitter.im/json-api-dotnet-core/Lobby
9+
- name: Ask on GitHub Discussions
10+
url: https://github.com/json-api-dotnet/JsonApiDotNetCore/discussions
1111
about: Get in touch with the whole community.
1212
- name: Ask on Stack Overflow
1313
url: https://stackoverflow.com/questions/tagged/json-api

.github/workflows/build.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
push:
1515
branches: [ 'master', 'release/**' ]
1616
release:
17-
types: [published]
17+
types: [ published ]
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,15 +23,15 @@ concurrency:
2323
env:
2424
DOTNET_NOLOGO: true
2525
DOTNET_CLI_TELEMETRY_OPTOUT: true
26-
SOLUTION_FILE: JsonApiDotNetCore.MongoDb.sln
26+
SOLUTION_FILE: JsonApiDotNetCore.MongoDb.slnx
2727

2828
jobs:
2929
build-and-test:
3030
timeout-minutes: 60
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
os: [ubuntu-latest, windows-latest, macos-latest]
34+
os: [ ubuntu-latest, windows-latest, macos-latest ]
3535
runs-on: ${{ matrix.os }}
3636
permissions:
3737
contents: read
@@ -114,7 +114,7 @@ jobs:
114114
strategy:
115115
fail-fast: false
116116
matrix:
117-
os: [ubuntu-latest, windows-latest, macos-latest]
117+
os: [ ubuntu-latest, windows-latest, macos-latest ]
118118
runs-on: ${{ matrix.os }}
119119
permissions:
120120
contents: read
@@ -140,7 +140,7 @@ jobs:
140140
$inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
141141
Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
142142
dotnet jb inspectcode --version
143-
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
143+
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"
144144
- name: Verify outcome
145145
shell: pwsh
146146
run: |
@@ -156,7 +156,7 @@ jobs:
156156
$issueType = $xml.report.IssueTypes.SelectSingleNode("IssueType[@Id='$($_.TypeId)']")
157157
$severity = $_.Severity ?? $issueType.Severity
158158
159-
Write-Output "[$severity] $($_.File):$($_.Line) $($_.TypeId): $($_.Message)"
159+
Write-Output "[$severity] ($($_.TargetFramework)) $($_.File):$($_.Line) $($_.TypeId): $($_.Message)"
160160
})
161161
})
162162
}
@@ -168,11 +168,11 @@ jobs:
168168
}
169169
170170
cleanup-code:
171-
timeout-minutes: 60
171+
timeout-minutes: 90
172172
strategy:
173173
fail-fast: false
174174
matrix:
175-
os: [ubuntu-latest, windows-latest, macos-latest]
175+
os: [ ubuntu-latest, windows-latest, macos-latest ]
176176
runs-on: ${{ matrix.os }}
177177
permissions:
178178
contents: read
@@ -194,7 +194,9 @@ jobs:
194194
- name: Restore tools
195195
run: dotnet tool restore
196196
- name: Restore packages
197-
run: dotnet restore
197+
run: dotnet restore /p:NuGetAudit=false
198+
- name: Build
199+
run: dotnet build --no-restore --configuration Release /p:RunAnalyzers=false
198200
- name: CleanupCode (on PR diff)
199201
if: ${{ github.event_name == 'pull_request' }}
200202
shell: pwsh
@@ -206,14 +208,14 @@ jobs:
206208
207209
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
208210
dotnet jb cleanupcode --version
209-
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
211+
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
210212
- name: CleanupCode (on branch)
211213
if: ${{ github.event_name == 'push' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
212214
shell: pwsh
213215
run: |
214216
Write-Output 'Running code cleanup on all files.'
215217
dotnet jb cleanupcode --version
216-
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
218+
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
217219
218220
publish:
219221
timeout-minutes: 60

.github/workflows/codeql.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
schedule:
99
- cron: '0 0 * * 5'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
analyze:
1317
name: Analyze

.github/workflows/deps-review.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: 'Dependency Review'
2-
on: [pull_request]
2+
on: [ pull_request ]
3+
4+
concurrency:
5+
group: ${{ github.workflow }}-${{ github.ref }}
6+
cancel-in-progress: true
37

48
permissions:
59
contents: read
@@ -13,4 +17,4 @@ jobs:
1317
with:
1418
persist-credentials: false
1519
- name: 'Dependency Review'
16-
uses: actions/dependency-review-action@v4
20+
uses: actions/dependency-review-action@v5

.idea/.idea.JsonApiDotNetCore.MongoDb/.idea/codeStyles/Project.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CSharpGuidelinesAnalyzer.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

CodingGuidelines.ruleset

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RuleSet Name="Coding Guidelines" Description=" " ToolsVersion="17.0">
3-
<Rules AnalyzerId="CSharpGuidelinesAnalyzer" RuleNamespace="CSharpGuidelinesAnalyzer">
4-
<Rule Id="AV1008" Action="Warning" />
5-
<Rule Id="AV1135" Action="None" />
6-
<Rule Id="AV1500" Action="None" />
7-
<Rule Id="AV1505" Action="Warning" />
8-
<Rule Id="AV1506" Action="Warning" />
9-
<Rule Id="AV1507" Action="Warning" />
10-
<Rule Id="AV1536" Action="None" />
11-
<Rule Id="AV1537" Action="None" />
12-
<Rule Id="AV1551" Action="None" />
13-
<Rule Id="AV1564" Action="None" />
14-
<Rule Id="AV1568" Action="Warning" />
15-
<Rule Id="AV1580" Action="None" />
16-
<Rule Id="AV1704" Action="None" />
17-
<Rule Id="AV1710" Action="None" />
18-
<Rule Id="AV1711" Action="None" />
19-
<Rule Id="AV1738" Action="Warning" />
20-
<Rule Id="AV1739" Action="Warning" />
21-
<Rule Id="AV1745" Action="Warning" />
22-
<Rule Id="AV2220" Action="Warning" />
23-
<Rule Id="AV2230" Action="Info" />
24-
<Rule Id="AV2305" Action="None" />
25-
<Rule Id="AV2318" Action="Warning" />
26-
</Rules>
273
<Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
284
<Rule Id="CA1027" Action="Warning" />
295
<Rule Id="CA1033" Action="Warning" />

Directory.Build.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AnalysisMode>Recommended</AnalysisMode>
1010
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
1111
<RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
12-
<VersionPrefix>5.10.1</VersionPrefix>
12+
<VersionPrefix>5.11</VersionPrefix>
1313
<VersionSuffix>pre</VersionSuffix>
1414
</PropertyGroup>
1515

@@ -49,8 +49,6 @@
4949

5050
<ItemGroup>
5151
<PackageReference Include="JetBrains.Annotations" Version="2025.2.*" PrivateAssets="All" />
52-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
53-
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
5452
</ItemGroup>
5553

5654
<ItemGroup>

JetBrainsInspectCodeTransform.xslt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<table style="width:100%">
2525
<tr>
2626
<th>File</th>
27+
<th>Target Framework</th>
2728
<th>Line Number</th>
2829
<th>Type</th>
2930
<th>Message</th>
@@ -33,6 +34,9 @@
3334
<td>
3435
<xsl:value-of select="@File"/>
3536
</td>
37+
<td>
38+
<xsl:value-of select="@TargetFramework"/>
39+
</td>
3640
<td>
3741
<xsl:value-of select="@Line"/>
3842
</td>

0 commit comments

Comments
 (0)