Skip to content

Commit 354370b

Browse files
bkoelmanbkoelman
authored
Merge pull request #1407 from json-api-dotnet/merge-master-v5.5.0-into-openapi
Merge master (v5.5.0) into openapi
2 parents 23da6d0 + 6f4456d commit 354370b

File tree

323 files changed

+5202
-4066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+5202
-4066
lines changed

‎.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2023.2.3",
6+
"version": "2023.3.0-eap08",
77
"commands": [
88
"jb"
99
]
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"dotnet-reportgenerator-globaltool": {
18-
"version": "5.1.26",
18+
"version": "5.2.0",
1919
"commands": [
2020
"reportgenerator"
2121
]
2222
},
2323
"docfx": {
24-
"version": "2.72.1",
24+
"version": "2.74.0",
2525
"commands": [
2626
"docfx"
2727
]

‎.github/workflows/build.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
- name: Setup .NET
4848
uses: actions/setup-dotnet@v3
4949
with:
50-
dotnet-version: 6.0.x
50+
dotnet-version: |
51+
6.0.x
52+
8.0.x
5153
- name: Setup PowerShell (Ubuntu)
5254
if: matrix.os == 'ubuntu-latest'
5355
run: |
@@ -103,6 +105,7 @@ jobs:
103105
104106
[xml]$xml = Get-Content Directory.Build.props
105107
$configuredVersionPrefix = $xml.Project.PropertyGroup.JsonApiDotNetCoreVersionPrefix | Select-Object -First 1
108+
106109
if ($configuredVersionPrefix -ne $versionPrefix) {
107110
Write-Error "Version prefix from git release tag '$versionPrefix' does not match version prefix '$configuredVersionPrefix' stored in Directory.Build.props."
108111
# To recover from this:
@@ -181,7 +184,9 @@ jobs:
181184
- name: Setup .NET
182185
uses: actions/setup-dotnet@v3
183186
with:
184-
dotnet-version: 6.0.x
187+
dotnet-version: |
188+
6.0.x
189+
8.0.x
185190
- name: Git checkout
186191
uses: actions/checkout@v4
187192
- name: Restore tools
@@ -192,7 +197,7 @@ jobs:
192197
run: |
193198
$inspectCodeOutputPath = Join-Path $env:RUNNER_TEMP 'jetbrains-inspectcode-results.xml'
194199
Write-Output "INSPECT_CODE_OUTPUT_PATH=$inspectCodeOutputPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
195-
dotnet jb inspectcode JsonApiDotNetCore.sln --build --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
200+
dotnet jb inspectcode JsonApiDotNetCore.sln --build --dotnetcoresdk=$(dotnet --version) --output="$inspectCodeOutputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --properties:ContinuousIntegrationBuild=false --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
196201
- name: Verify outcome
197202
shell: pwsh
198203
run: |
@@ -232,7 +237,9 @@ jobs:
232237
- name: Setup .NET
233238
uses: actions/setup-dotnet@v3
234239
with:
235-
dotnet-version: 6.0.x
240+
dotnet-version: |
241+
6.0.x
242+
8.0.x
236243
- name: Git checkout
237244
uses: actions/checkout@v4
238245
with:
@@ -253,13 +260,13 @@ jobs:
253260
$baseCommitHash = git rev-parse HEAD~1
254261
255262
Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request."
256-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --max-runs=5 --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
263+
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 --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff
257264
- name: CleanupCode (on branch)
258265
if: github.event_name == 'push' || github.event_name == 'release'
259266
shell: pwsh
260267
run: |
261268
Write-Output "Running code cleanup on all files."
262-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
269+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="JADNC Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff
263270
264271
publish:
265272
timeout-minutes: 60

‎.github/workflows/codeql.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'release/**', 'openapi' ]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [ 'master', 'release/**', 'openapi' ]
9+
schedule:
10+
- cron: '0 0 * * 5'
11+
12+
jobs:
13+
analyze:
14+
name: Analyze
15+
runs-on: 'ubuntu-latest'
16+
timeout-minutes: 60
17+
permissions:
18+
actions: read
19+
contents: read
20+
security-events: write
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
language: [ 'csharp' ]
25+
steps:
26+
- name: Setup .NET
27+
uses: actions/setup-dotnet@v3
28+
with:
29+
dotnet-version: |
30+
6.0.x
31+
8.0.x
32+
- name: Git checkout
33+
uses: actions/checkout@v4
34+
- name: Initialize CodeQL
35+
uses: github/codeql-action/init@v2
36+
with:
37+
languages: ${{ matrix.language }}
38+
- name: Autobuild
39+
uses: github/codeql-action/autobuild@v2
40+
- name: Perform CodeQL Analysis
41+
uses: github/codeql-action/analyze@v2
42+
with:
43+
category: "/language:${{matrix.language}}"

‎Directory.Build.props

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,20 @@
1313
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1414
</PropertyGroup>
1515

16-
<PropertyGroup>
17-
<!-- Published dependencies (only update on major version change) -->
18-
<TargetFrameworkName>net6.0</TargetFrameworkName>
19-
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
20-
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
21-
<EntityFrameworkCoreFrozenVersion>6.0.0</EntityFrameworkCoreFrozenVersion>
22-
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
23-
<SwashbuckleFrozenVersion>6.5.0</SwashbuckleFrozenVersion>
24-
25-
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
26-
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
27-
<BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
28-
<BlushingPenguinVersion>1.0.*</BlushingPenguinVersion>
29-
<BogusVersion>34.0.*</BogusVersion>
30-
<CSharpGuidelinesAnalyzerVersion>3.8.*</CSharpGuidelinesAnalyzerVersion>
31-
<CodeAnalysisVersion>4.7.*</CodeAnalysisVersion>
32-
<CoverletVersion>6.0.*</CoverletVersion>
33-
<DapperVersion>2.1.*</DapperVersion>
34-
<DateOnlyTimeOnlyVersion>2.1.*</DateOnlyTimeOnlyVersion>
35-
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
36-
<FluentAssertionsVersion>6.12.*</FluentAssertionsVersion>
37-
<GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
38-
<InheritDocVersion>1.3.*</InheritDocVersion>
39-
<JetBrainsAnnotationsVersion>2023.3.*</JetBrainsAnnotationsVersion>
40-
<MicrosoftApiClientVersion>7.0.*</MicrosoftApiClientVersion>
41-
<NSwagApiClientVersion>13.20.*</NSwagApiClientVersion>
42-
<NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
43-
<NpgsqlVersion>7.0.*</NpgsqlVersion>
44-
<SourceLinkVersion>1.1.*</SourceLinkVersion>
45-
<SwashbuckleVersion>6.5.*</SwashbuckleVersion>
46-
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
47-
<TestSdkVersion>17.8.*</TestSdkVersion>
48-
<XunitVersion>2.5.*</XunitVersion>
49-
</PropertyGroup>
50-
5116
<ItemGroup>
52-
<PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsAnnotationsVersion)" PrivateAssets="All" />
53-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="$(CSharpGuidelinesAnalyzerVersion)" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.*" PrivateAssets="All" />
18+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />
5419
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
5520
</ItemGroup>
5621

5722
<PropertyGroup>
5823
<Nullable>enable</Nullable>
24+
<LangVersion>latest</LangVersion>
5925
<ImplicitUsings>enable</ImplicitUsings>
6026
<IsPackable>false</IsPackable>
6127
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
6228
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
6329
<RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
64-
<JsonApiDotNetCoreVersionPrefix>5.4.1</JsonApiDotNetCoreVersionPrefix>
30+
<JsonApiDotNetCoreVersionPrefix>5.5.1</JsonApiDotNetCoreVersionPrefix>
6531
</PropertyGroup>
6632
</Project>

‎JsonApiDotNetCore.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
CSharpGuidelinesAnalyzer.config = CSharpGuidelinesAnalyzer.config
1515
Directory.Build.props = Directory.Build.props
1616
tests.runsettings = tests.runsettings
17+
package-versions.props = package-versions.props
1718
EndProjectSection
1819
EndProject
1920
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{026FBC6C-AF76-4568-9B87-EC73457899FD}"

‎JsonApiDotNetCore.sln.DotSettings

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
6969
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverload/@EntryIndexedValue">WARNING</s:String>
7070
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MethodHasAsyncOverloadWithCancellation/@EntryIndexedValue">WARNING</s:String>
7171
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
72+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RawStringCanBeSimplified/@EntryIndexedValue">SUGGESTION</s:String>
7273
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">SUGGESTION</s:String>
7374
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAttributeParentheses/@EntryIndexedValue">SUGGESTION</s:String>
7475
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantCollectionInitializerElementBraces/@EntryIndexedValue">DO_NOT_SHOW</s:String>
@@ -95,7 +96,9 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
9596
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEventArgsEmptyField/@EntryIndexedValue">WARNING</s:String>
9697
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternInIsExpression/@EntryIndexedValue">SUGGESTION</s:String>
9798
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNegatedPatternMatching/@EntryIndexedValue">SUGGESTION</s:String>
99+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseRawString/@EntryIndexedValue">SUGGESTION</s:String>
98100
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
101+
<s:String x:Key="/Default/CodeInspection/Highlighting/UseCollectionExpression/ConvertEmptyCollection/@EntryValue">SUGGESTION</s:String>
99102
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" ArrangeNullCheckingPattern="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;CSReformatInactiveBranches&gt;True&lt;/CSReformatInactiveBranches&gt;&lt;/Profile&gt;</s:String>
100103
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">JADNC Full Cleanup</s:String>
101104
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
@@ -116,6 +119,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
116119
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_LOCK_STMT/@EntryValue">True</s:Boolean>
117120
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_USINGS_STMT/@EntryValue">True</s:Boolean>
118121
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_WHILE_STMT/@EntryValue">True</s:Boolean>
122+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_RAW_LITERAL_STRING/@EntryValue">INDENT</s:String>
119123
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
120124
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
121125
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_DECLARATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
@@ -128,6 +132,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
128132
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_SWITCH_EXPRESSION_ARRANGEMENT/@EntryValue">False</s:Boolean>
129133
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
130134
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
135+
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MAX_ARRAY_INITIALIZER_ELEMENTS_ON_LINE/@EntryValue">1</s:Int64>
131136
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
132137
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
133138
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
@@ -148,6 +153,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$);</s:String>
148153
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_BEFORE_LINQ_EXPRESSION/@EntryValue">True</s:Boolean>
149154
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_FOR_STMT_HEADER_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
150155
<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">160</s:Int64>
156+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIST_PATTERN/@EntryValue">CHOP_IF_LONG</s:String>
151157
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_DECLARATION_STYLE/@EntryValue">WRAP_IF_LONG</s:String>
152158
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
153159
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>

‎README.md

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,24 @@ app.MapControllers();
7676
The following chart should help you pick the best version, based on your environment.
7777
See also our [versioning policy](./VERSIONING_POLICY.md).
7878

79-
| JsonApiDotNetCore | Status | .NET | Entity Framework Core |
80-
| ----------------- | ----------- | -------- | --------------------- |
81-
| 3.x | Stable | Core 2.x | 2.x |
82-
| 4.x | Stable | Core 3.1 | 3.1 |
83-
| | | Core 3.1 | 5 |
84-
| | | 5 | 5 |
85-
| | | 6 | 5 |
86-
| 5.0.0-5.0.2 | Stable | 6 | 6 |
87-
| 5.0.3+ | Stable | 6 | 6 |
88-
| | | 6 | 7 |
89-
| | | 7 | 7 |
79+
| JsonApiDotNetCore | Status | .NET | Entity Framework Core |
80+
| ----------------- | ------------ | -------- | --------------------- |
81+
| 3.x | Stable | Core 2.x | 2.x |
82+
| 4.x | Stable | Core 3.1 | 3.1, 5 |
83+
| | | 5 | 5 |
84+
| | | 6 | 5 |
85+
| 5.0.0-5.0.2 | Stable | 6 | 6 |
86+
| 5.0.3-5.4.0 | Stable | 6 | 6, 7 |
87+
| | | 7 | 7 |
88+
| 5.5+ | Stable | 6 | 6, 7 |
89+
| | | 7 | 7 |
90+
| | | 8 | 8 |
91+
| master | Preview | 6 | 6, 7 |
92+
| | | 7 | 7 |
93+
| | | 8 | 8 |
94+
| openapi | Experimental | 6 | 6, 7 |
95+
| | | 7 | 7 |
96+
| | | 8 | 8 |
9097

9198
## Contributing
9299

0 commit comments

Comments
 (0)