Skip to content

Merge experimental OpenAPI support into master #1716

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 360 commits into from
Apr 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
360 commits
Select commit Hold shift + click to select a range
9ba5ec3
Simplify dependencies: take ResourceType instead of ClrType
bkoelman Nov 2, 2023
b0fa688
Fixed: removed unused entries that are not top-level documents
bkoelman Nov 2, 2023
37f41fe
Merge pull request #1438 from json-api-dotnet/openapi-fix-id-paramete…
bkoelman Jan 14, 2024
5c53abb
Do not wrap resource type in allOf. It is never null or documented, s…
bkoelman Nov 2, 2023
64d1503
Extract resource identifier schema generator
bkoelman Nov 2, 2023
36a21c6
Fixed: relationship endpoints don't support includes
bkoelman Jan 30, 2024
ebf4f10
JsonApiObjects consistency renames: ResourceObject -> ResourceData, R…
bkoelman Jan 30, 2024
d9261d7
Injectable schema generators, remove building of intermediate service…
bkoelman Jan 31, 2024
e27c98f
Add current server into OAS, fix invalid data type warning in examples
bkoelman Jan 31, 2024
2293b1f
Example: Use http handler for writing to the console
bkoelman Jan 31, 2024
7e6b6be
Fixed invalid assertions
bkoelman Jan 31, 2024
5202b7c
Centralize component schema ID templates
bkoelman Feb 1, 2024
022285d
Generate controllers for all endpoints in tests, so they can be used …
bkoelman Feb 1, 2024
af0846e
Produce OAS file at build time in example, referenced by client on di…
bkoelman Feb 1, 2024
4e33ee3
Add baseline copy of Swashbuckle's SchemaGenerator
bkoelman Feb 1, 2024
97bd1bc
Add support for returning included resources using allOf inheritance …
bkoelman Feb 1, 2024
6c9aff8
Merge pull request #1448 from json-api-dotnet/openapi-includes
bkoelman Feb 2, 2024
61ab4a9
Fixed: set visbility of JSON:API action methods based on GenerateCont…
bkoelman Feb 3, 2024
71db1dd
Simplify IoC container setup
bkoelman Feb 10, 2024
f7f8f8b
Merge pull request #1450 from json-api-dotnet/openapi-filter-endpoints
bkoelman Feb 12, 2024
01f131e
Make more types injectable
bkoelman Feb 11, 2024
04f10ef
Use ConfigureAwait in OpenApi.Client, because callers may be desktop …
bkoelman Feb 11, 2024
b192bfa
Fix incorrect names and order in DocCommentsTests
bkoelman Feb 12, 2024
0cd9754
Emit error response document in OAS
bkoelman Feb 12, 2024
2af36db
Merge pull request #1460 from json-api-dotnet/openapi-error-responses
bkoelman Feb 12, 2024
dd71370
Fix OpenAPI crash when running in VS with debugger attached, see http…
bkoelman Feb 16, 2024
acc5de2
Merge pull request #1464 from json-api-dotnet/openapi-fix-vs-crash
bkoelman Feb 16, 2024
df5902d
Fix type/filename mismatch
bkoelman Feb 21, 2024
649291c
Merge branch 'master' into merge-master-into-openapi
bkoelman Feb 21, 2024
69d91d6
Merge pull request #1474 from json-api-dotnet/merge-master-into-openapi
bkoelman Feb 21, 2024
54c401c
openapi: include headers (#1459)
verdie-g Feb 23, 2024
dca8e8a
Rename project JsonApiDotNetCore.OpenApi.Client to JsonApiDotNetCore.…
bkoelman Feb 24, 2024
04da441
Rename test and example projects to include NSwag in their names
bkoelman Feb 24, 2024
8b25f1c
Align example project settings with tests
bkoelman Feb 24, 2024
2e6e9a0
Clean up references to Swashbuckle* packages
bkoelman Feb 24, 2024
c29a2e6
Convert OpenAPI client example into worker service
bkoelman Feb 24, 2024
03d1c86
Capture network traffic during testruns
bkoelman Feb 24, 2024
f8d2a74
Put NSwag-generated clients under source control
bkoelman Feb 24, 2024
e0cf39f
Write swagger.g.json files in server test project instead of client t…
bkoelman Feb 24, 2024
91b80ad
Fix location of AssemblyInfo.cs
bkoelman Feb 24, 2024
047899e
Cleanup in existing tests
bkoelman Feb 25, 2024
19ab048
Add support for Kiota (lib, example and tests)
bkoelman Feb 25, 2024
7b139cb
Add documentation for kiota
bkoelman Feb 25, 2024
0509424
Remove IMvcCoreBuilder parameter from AddOpenApi()
bkoelman Feb 25, 2024
3138d8c
Revert writing NSwag generated clients under source control, due to i…
bkoelman Feb 26, 2024
7ed65c2
Exclude kiota-lock.json from source control due to bug in Kiota
bkoelman Feb 26, 2024
7f10c8a
Fix CodeQL build (kiota requires to be restored before build)
bkoelman Feb 26, 2024
fccd8dd
Fix incorrect namespace
bkoelman Feb 27, 2024
66cf92f
Merge pull request #1479 from json-api-dotnet/openapi-client-kiota
bkoelman Mar 2, 2024
1b89742
OpenAPI: Client-generated IDs (#1494)
bkoelman Mar 10, 2024
10d7c59
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 10, 2024
22b00b3
Merge pull request #1496 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 10, 2024
b53ece1
Add missing properties to ErrorResponseDocument
bkoelman Mar 10, 2024
6b5bb6a
Set the describedby top-level link to point to the OpenAPI document URL
bkoelman Mar 11, 2024
ff2f420
Merge pull request #1497 from json-api-dotnet/links-described-by
bkoelman Mar 11, 2024
7025805
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 16, 2024
fed4eb8
Merge pull request #1505 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 16, 2024
a2b3bec
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 17, 2024
aa2c382
Run tests after merge, which now generates request bodies as required
bkoelman Mar 17, 2024
41524d4
Use newer GetCustomAttributes method
bkoelman Mar 17, 2024
05d72b0
Merge pull request #1507 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 17, 2024
3b615af
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 18, 2024
9fbe809
Merge pull request #1509 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 18, 2024
bba1544
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 22, 2024
2724d63
Merge pull request #1514 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 22, 2024
1c4f39f
Consistency renames in tests
bkoelman Mar 14, 2024
ce9dc76
Fixed: links in resource object must not be required
bkoelman Mar 14, 2024
e4df53f
Fixed incorrect ETag tests: header value is a collection, so tests wo…
bkoelman Mar 15, 2024
ddbf6dc
Extract request body into variable, add missing Kiota tests
bkoelman Mar 15, 2024
650ea43
Add missing end-to-end tests for Location and Content-Length HTTP hea…
bkoelman Mar 15, 2024
c76f34f
Fixed: Another cause for 409 Conflict is that another resource with t…
bkoelman Mar 16, 2024
612a09f
Add missing test to client generation modes
bkoelman Mar 16, 2024
a6925ca
Replace reflection-based code
bkoelman Mar 17, 2024
b736298
Fixed: Add missing 404 status from post resource request
bkoelman Mar 17, 2024
823336d
Fixed: produce helpful error when [FromBody] is missing, add tests
bkoelman Mar 17, 2024
112e208
Revert "Fixed: removed unused entries that are not top-level documents"
bkoelman Mar 17, 2024
d475f8c
Remove redundant partial class
bkoelman Mar 18, 2024
46a2892
Add assertion on exception message in kiota tests, fix etag error ass…
bkoelman Mar 22, 2024
63e1d30
Add end-to-end tests for JSON:API endpoints
bkoelman Mar 15, 2024
8556a30
Revert "Resharper: Replace async method with Task return"
bkoelman Mar 22, 2024
c67b602
Merge pull request #1512 from json-api-dotnet/openapi-endpoint-tests
bkoelman Mar 22, 2024
c26893f
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 23, 2024
66be210
Merge pull request #1517 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 23, 2024
60a7206
Use post-processing step to cleanup unused component schemas
bkoelman Mar 23, 2024
8cc8220
Remove [Required] usage on links, because all links can be turned off
bkoelman Mar 23, 2024
4ba9f40
Renames for parity with JSON:API terminology
bkoelman Mar 24, 2024
6b6cf38
Fixed: make relationship links non-required
bkoelman Mar 26, 2024
5ab8b22
Hide links that are inaccessible
bkoelman Mar 25, 2024
7722b87
Add test for alternate Swagger route
bkoelman Mar 27, 2024
1bdee8b
Merge pull request #1518 from json-api-dotnet/openapi-links
bkoelman Mar 27, 2024
1ec31d2
Declare Data properties as members instead of via base type
bkoelman Mar 29, 2024
10980e6
Centralize some schema type arrays, extension to unwrap constructed g…
bkoelman Mar 29, 2024
1f38b99
Merge pull request #1522 from json-api-dotnet/refactor-data-properties
bkoelman Mar 30, 2024
67ce105
Merge branch 'master' into merge-master-into-openapi
bkoelman Apr 10, 2024
9bdea37
Merge pull request #1527 from json-api-dotnet/merge-master-into-openapi
bkoelman Apr 10, 2024
048d6f3
Merge branch 'master' into merge-master-into-openapi
bkoelman May 18, 2024
4dc5b33
Update package Swashbuckle.AspNetCore to v6.6.*
bkoelman May 18, 2024
e98bdbd
Fix abbreviation
bkoelman May 18, 2024
96cb1dc
Update package microsoft.openapi.kiota to v1.14.0
bkoelman May 18, 2024
cdca6e0
Merge pull request #1546 from json-api-dotnet/merge-master-into-openapi
bkoelman May 18, 2024
6c9e049
Update frozen Swashbuckle dependency to latest version and remove pat…
bkoelman May 19, 2024
c2a1f1a
Merge pull request #1548 from json-api-dotnet/openapi-update-swashbuckle
bkoelman May 19, 2024
98c88c2
Merge branch 'master' into merge-master-into-openapi
bkoelman May 25, 2024
19ff19f
Merge pull request #1552 from json-api-dotnet/merge-master-into-openapi
bkoelman May 25, 2024
5c3401f
Merge branch 'master' into merge-master-into-openapi
bkoelman May 26, 2024
459ced3
Merge pull request #1554 from json-api-dotnet/merge-master-into-openapi
bkoelman May 26, 2024
e35da84
openapi: support validation attributes (#1477)
verdie-g Jun 21, 2024
1fa6dfb
Run tests against the latest prerelease version of Swashbuckle, which…
bkoelman Jun 23, 2024
3c48e2c
Account for swagger.g.json per target framework
bkoelman Jun 23, 2024
18a4edf
Merge pull request #1568 from json-api-dotnet/openapi-update-swashbuckle
bkoelman Jun 23, 2024
5df4928
Merge branch 'master' into merge-master-into-openapi
bkoelman Jun 25, 2024
1053099
Merge pull request #1570 from json-api-dotnet/merge-master-into-openapi
bkoelman Jun 25, 2024
749e778
Renames of component schema types, fix deviating property order betwe…
bkoelman Jun 29, 2024
9f8f761
Update kiota version
bkoelman Jun 29, 2024
9a90ef8
Extract meta into component schema, allow any type as dictionary valu…
bkoelman Jun 29, 2024
6178c58
Cleanup allOf wrapping/unwrapping
bkoelman Jun 29, 2024
8e1d16d
Unify method names in schema generators, move into subdirectory, spli…
bkoelman Jun 29, 2024
eab1f55
Simplify clone methods by using generic type parameter
bkoelman Jun 29, 2024
e9476b8
Add OpenAPI support for atomic operations
bkoelman Jun 29, 2024
67924c4
Merge pull request #1580 from json-api-dotnet/openapi-operations
bkoelman Jun 30, 2024
72cefc6
Merge branch 'master' into merge-master-into-openapi
bkoelman Jun 30, 2024
6ddd7b8
Merge pull request #1585 from json-api-dotnet/merge-master-into-openapi
bkoelman Jun 30, 2024
4203b06
Fix temporary build errors when kiota source files are added/removed …
bkoelman Jul 9, 2024
2ae071d
Merge branch 'master' into merge-master-into-openapi
bkoelman Jul 11, 2024
973883d
Merge pull request #1589 from json-api-dotnet/merge-master-into-openapi
bkoelman Jul 11, 2024
ad59224
Merge branch 'master' into merge-master-into-openapi
bkoelman Jul 14, 2024
92e5590
Merge pull request #1594 from json-api-dotnet/merge-master-into-openapi
bkoelman Jul 14, 2024
a18666c
Add type hints on 'id' parameters and properties
bkoelman Jul 14, 2024
47a1589
Merge pull request #1595 from json-api-dotnet/openapi-type-hints
bkoelman Jul 14, 2024
3152e9d
Emit warning about renamed NuGet package on build (#1596)
bkoelman Jul 14, 2024
5c95566
Revert "Emit warning about renamed NuGet package on build"
bkoelman Jul 14, 2024
a4ea7a8
Rename JsonApiDotNetCore.OpenApi NuGet package to JsonApiDotNetCore.O…
bkoelman Jul 14, 2024
946c472
Merge pull request #1597 from json-api-dotnet/openapi-pkg-rename
bkoelman Jul 14, 2024
9c74c33
Correct relationship data requiredness in response models, so the gen…
bkoelman Jul 19, 2024
54c31ed
Update to NSwag 14, distribute our recommended NSwag MSBuild properti…
bkoelman Jul 19, 2024
4488a21
Update EndToEndTests to use nullability defaults from NuGet package
bkoelman Jul 19, 2024
be9165b
Merge pull request #1600 from json-api-dotnet/update-to-nswag-14
bkoelman Jul 19, 2024
1756004
Merge branch 'master' into merge-master-into-openapi
bkoelman Oct 1, 2024
df55a7e
Resharper: fix primary constructor
bkoelman Oct 1, 2024
077a426
Wrap faker.Generate methods, so that a non-nullable return type is in…
bkoelman Sep 21, 2024
7329594
Use source-generated structured logging, fixes rule CA1848: use the L…
bkoelman Sep 23, 2024
5530832
Replace ToPascalCase extension method with Humanizer call
bkoelman Sep 23, 2024
0bbaed7
Fix SYSLIB1045: Use 'GeneratedRegexAttribute' to generate the regular…
bkoelman Sep 23, 2024
fba9efa
Fix CA1810: Initialize reference type static fields inline
bkoelman Sep 23, 2024
a5337ac
Suppress CA1852: Seal internal types
bkoelman Sep 23, 2024
af0414f
Fix CA1859: Use concrete types when possible for improved performance
bkoelman Sep 23, 2024
fd5bc84
Replicate changes from master into copied files
bkoelman Sep 23, 2024
9597b20
Fix CA1062: Validate arguments of public methods
bkoelman Sep 23, 2024
dca3ba8
Suppress CA1064: Exceptions should be public
bkoelman Sep 23, 2024
eb05856
Suppress CA1711: Identifiers should not have incorrect suffix
bkoelman Sep 23, 2024
150eb26
Fix CA1853: Unnecessary call to 'Dictionary.ContainsKey(key)'
bkoelman Sep 23, 2024
ef56e34
Fix CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method
bkoelman Sep 23, 2024
6e32ad5
Fix CA1860: Avoid using 'Enumerable.Any()' extension method
bkoelman Sep 23, 2024
b6c2768
Fix CA2016: Forward the CancellationToken parameter to methods that t…
bkoelman Sep 23, 2024
f45335b
Fix CA2201: Do not raise reserved exception types
bkoelman Sep 23, 2024
802dcfc
Fix CA5372: Use XmlReader for XPathDocument
bkoelman Sep 23, 2024
2f54984
Fix IDE0200: Remove unnecessary lambda expression
bkoelman Sep 23, 2024
ee93822
Fix CA2000: Dispose objects before losing scope
bkoelman Oct 1, 2024
fb1278a
Fix CA1001: Types that own disposable fields should be disposable
bkoelman Oct 1, 2024
aa17e02
Package updates
bkoelman Oct 1, 2024
abfc8c8
Reformat solution
bkoelman Oct 1, 2024
0a3fa63
Merge pull request #1615 from json-api-dotnet/merge-master-into-openapi
bkoelman Oct 1, 2024
a03b349
Merge branch 'master' into merge-master-into-openapi
bkoelman Oct 16, 2024
a11a2f6
Merge pull request #1621 from json-api-dotnet/merge-master-into-openapi
bkoelman Oct 16, 2024
2fd9263
Bump kiota from v1.18.0 to v1.19.1 (#1620)
bkoelman Oct 16, 2024
111a898
Merge branch 'master' into merge-master-into-openapi
bkoelman Oct 21, 2024
32f7515
Post-merge fixes
bkoelman Oct 21, 2024
9657947
Merge pull request #1624 from json-api-dotnet/merge-master-into-openapi
bkoelman Oct 21, 2024
462a6e3
Merge branch 'master' into merge-master-into-openapi
bkoelman Nov 11, 2024
e5a7084
Merge pull request #1630 from json-api-dotnet/merge-master-into-openapi
bkoelman Nov 11, 2024
9243289
Merge branch 'master' into merge-master-into-openapi
bkoelman Nov 26, 2024
575f579
Post-merge fixes
bkoelman Nov 27, 2024
9010f16
Merge pull request #1645 from json-api-dotnet/merge-master-into-openapi
bkoelman Nov 27, 2024
900f20c
Merge branch 'master' into merge-master-into-openapi
bkoelman Nov 27, 2024
11aafa4
Remove JsonApiEndpoint, reuse logic from base library
bkoelman Nov 27, 2024
68cad58
Merge pull request #1647 from json-api-dotnet/merge-master-into-openapi
bkoelman Nov 27, 2024
22f6d92
Various small internal cleanups
bkoelman Nov 27, 2024
b38f195
Fixed: do not emit AdditionalProperties on relationshipName and resou…
bkoelman Nov 27, 2024
a0aec70
Rename operationDiscriminator to openapi:discriminator and emit as pr…
bkoelman Nov 28, 2024
e193759
Add missing meta in resource identifier objects, add missing meta in …
bkoelman Nov 28, 2024
ddb5e10
Add missing request meta in top-level documents and relationship objects
bkoelman Nov 28, 2024
8bab51a
Change discriminator type in dataInResponse from string to ResourceTy…
bkoelman Nov 28, 2024
732e52c
Simplify assertions
bkoelman Nov 28, 2024
5454188
Rename ResourceTypeInfo to ResourceSchemaType
bkoelman Nov 29, 2024
d10d51b
Reorder constructor parameters: IJsonApiOptions before IResourceGraph
bkoelman Nov 29, 2024
db1be78
Merge pull request #1648 from json-api-dotnet/openapi-various
bkoelman Nov 29, 2024
f69cc54
Merge branch 'master' into merge-master-into-openapi
bkoelman Dec 24, 2024
df14313
Post-merge fixes and package updates
bkoelman Dec 24, 2024
6a60d4a
Merge pull request #1657 from json-api-dotnet/merge-master-into-openapi
bkoelman Dec 24, 2024
3c32fa0
OpenAPI: Update tools for generating documentation website (#1661)
bkoelman Jan 3, 2025
e1635c2
Merge branch 'master' into merge-master-into-openapi
bkoelman Jan 3, 2025
d81abed
Merge pull request #1662 from json-api-dotnet/merge-master-into-openapi
bkoelman Jan 3, 2025
204074c
Mark AddOpenApiForJsonApi with [Experimental]
bkoelman Jan 3, 2025
55faea6
Replace UnreachableCodeException with built-in UnreachableException
bkoelman Jan 3, 2025
d196e12
Merge pull request #1663 from json-api-dotnet/openapi-mark-experimental
bkoelman Jan 3, 2025
303cef9
Merge branch 'master' into merge-master-into-openapi
bkoelman Jan 4, 2025
44c3f71
Post-merge fixes
bkoelman Jan 4, 2025
2212fc2
Merge pull request #1665 from json-api-dotnet/merge-master-into-openapi
bkoelman Jan 4, 2025
1bc5703
Add workaround for kiota nullability bug at https://github.com/micros…
bkoelman Jan 17, 2025
8db185c
Update kiota to latest version
bkoelman Jan 18, 2025
d9aa8d0
Merge pull request #1667 from json-api-dotnet/update-kiota
bkoelman Jan 18, 2025
75c1837
Add MSBuild integration for kiota generate, loosely based on https://…
bkoelman Jan 27, 2025
bb609eb
Merge branch 'master' into merge-master-into-openapi
bkoelman Feb 15, 2025
3b8b0d7
Merge branch 'master' into merge-master-into-openapi
bkoelman Feb 15, 2025
cdc6962
Merge pull request #1680 from json-api-dotnet/merge-master-into-openapi
bkoelman Feb 15, 2025
e8e3093
Replace API for change tracking with NSwag to support atomic operatio…
bkoelman Feb 22, 2025
4635800
Backport various fixes and enhancements from other work in progress (…
bkoelman Feb 22, 2025
dbde12d
Merge branch 'master' into merge-master-into-openapi
bkoelman Feb 23, 2025
6d33a9a
Merge pull request #1689 from json-api-dotnet/merge-master-into-openapi
bkoelman Feb 23, 2025
1c8ae15
Merge branch 'master' into merge-master-into-openapi
bkoelman Feb 23, 2025
fcd3aa1
Merge pull request #1691 from json-api-dotnet/merge-master-into-openapi
bkoelman Feb 23, 2025
47e77da
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 2, 2025
520e5a0
Remove redundant suppressions
bkoelman Mar 2, 2025
5a34ed3
Remove usages of ShouldHaveCount
bkoelman Mar 2, 2025
7120fca
Remove usages of ShouldNotBeNullOrEmpty
bkoelman Mar 2, 2025
82c48a2
Remove usages of ShouldContainKey
bkoelman Mar 2, 2025
b20fc70
Remove usages of ShouldNotBeNull and redundant With calls
bkoelman Mar 2, 2025
84c0a96
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 2, 2025
61c6cd5
Rename type with FluentAssertions extension methods
bkoelman Mar 2, 2025
749e588
Merge pull request #1694 from json-api-dotnet/merge-master-into-openapi
bkoelman Mar 2, 2025
3356544
Kiota: Replace PowerShell script with inline MSBuild task for improve…
bkoelman Mar 2, 2025
5c2f2ec
Package updates (#1698)
bkoelman Mar 15, 2025
473b647
Add missing 422 status code in post/patch/delete relationship endpoint
bkoelman Mar 16, 2025
eeabf06
Reduce nesting in kiota tests
bkoelman Mar 16, 2025
4869615
Naming consistency: use `requestBody` and `response` for OpenAPI calls
bkoelman Mar 16, 2025
0a5d2c5
Remove redundant ApiResponse.TranslateAsync calls
bkoelman Mar 16, 2025
aa0e4f0
Merge pull request #1701 from json-api-dotnet/openapi-status-422
bkoelman Mar 16, 2025
fcca17d
Update Swashbuckle to 8.0 (#1702)
bkoelman Mar 22, 2025
107bbeb
Schema renames, improved detection of unused component schemas
bkoelman Mar 23, 2025
b55e165
Resource inheritance in OpenAPI
bkoelman Mar 23, 2025
1564724
Rename schema generators for bodies to generators for documents
bkoelman Mar 23, 2025
c9bb868
Consistency renames of parameters for schema types
bkoelman Mar 23, 2025
fb78af3
Merge pull request #1704 from json-api-dotnet/openapi-inheritance
bkoelman Mar 24, 2025
d58306b
Improve code coverage by skipping unreachable code
bkoelman Mar 24, 2025
45696f6
Convert switch expressions to if statements to improve code coverage
bkoelman Mar 24, 2025
a771afa
Merge pull request #1705 from json-api-dotnet/improve-coverage
bkoelman Mar 25, 2025
fde8e80
Merge branch 'master' into merge-master-into-openapi
bkoelman Mar 28, 2025
5d49ecb
Merge master into openapi (#1707)
bkoelman Mar 29, 2025
b5f0a9e
Bump kiota and NSwag (#1708)
bkoelman Mar 30, 2025
87f8d52
Add trace logging for component schema generation (#1709)
bkoelman Mar 30, 2025
5a4e8cc
Merge branch 'master' into merge-master-into-openapi
bkoelman Apr 20, 2025
7883e69
Trim trailing whitespace from files in OpenAPI
bkoelman Apr 20, 2025
cccb011
Merge pull request #1714 from json-api-dotnet/merge-master-into-openapi
bkoelman Apr 20, 2025
14a44cd
Document OpenAPI limitations (#1715)
bkoelman Apr 20, 2025
95177aa
Remove references to openapi branch
bkoelman Apr 21, 2025
de1a37c
Remove left-over exclusion for SchemaGenerator.cs
bkoelman Apr 21, 2025
83b0a45
Revert unintentional changes, resulting from earlier bad merges
bkoelman Apr 21, 2025
ffd1003
Enable NuGet push for stable JsonApiDotNetCore with OpenAPI packages …
bkoelman Apr 21, 2025
42c2c7d
Fail at startup when ASP.NET OpenAPI is registered
bkoelman Apr 21, 2025
81ed9a2
Package updates
bkoelman Apr 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 8 additions & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.4.4",
"version": "5.4.5",
"commands": [
"reportgenerator"
],
Expand All @@ -29,6 +29,13 @@
"docfx"
],
"rollForward": false
},
"microsoft.openapi.kiota": {
"version": "1.25.1",
"commands": [
"kiota"
],
"rollForward": false
}
}
}
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# When running OpenAPI tests, these committed files are downloaded and written to disk (so we'll know when something changes).
# On Windows, these text files are auto-converted to crlf on git fetch, while the written downloaded files use lf line endings.
# Therefore, running the tests on Windows creates local changes. Staging them auto-converts back to crlf, which undoes the changes.
# To avoid this annoyance, the next line opts out of the auto-conversion and forces line endings to lf.
**/GeneratedSwagger/**/*.json text eol=lf
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ jobs:
$versionSuffix = $segments.Length -eq 1 ? '' : $segments[1..$($segments.Length - 1)] -join '-'

[xml]$xml = Get-Content Directory.Build.props
$configuredVersionPrefix = $xml.Project.PropertyGroup.JsonApiDotNetCoreVersionPrefix | Select-Object -First 1
$configuredVersionPrefix = $xml.Project.PropertyGroup.VersionPrefix | Select-Object -First 1

if ($configuredVersionPrefix -ne $versionPrefix) {
Write-Error "Version prefix from git release tag '$versionPrefix' does not match version prefix '$configuredVersionPrefix' stored in Directory.Build.props."
# To recover from this:
# - Delete the GitHub release
# - Run: git push --delete origin the-invalid-tag-name
# - Adjust JsonApiDotNetCoreVersionPrefix in Directory.Build.props, commit and push
# - Adjust VersionPrefix in Directory.Build.props, commit and push
# - Recreate the GitHub release
}
}
Expand Down Expand Up @@ -284,4 +284,4 @@ jobs:
NUGET_ORG_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }}
shell: pwsh
run: |
dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:NUGET_ORG_API_KEY" --source 'nuget.org'
dotnet nuget push "$env:GITHUB_WORKSPACE/packages/*.nupkg" --api-key "$env:NUGET_ORG_API_KEY" --source 'nuget.org' --skip-duplicate
3 changes: 3 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- name: Restore .NET tools
run: |
dotnet tool restore
- name: Autobuild
uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
Expand Down
6 changes: 2 additions & 4 deletions Build.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
$versionSuffix="pre"

function VerifySuccessExitCode {
if ($LastExitCode -ne 0) {
throw "Command failed with exit code $LastExitCode."
Expand All @@ -16,7 +14,7 @@ Remove-Item -Recurse -Force * -Include coverage.cobertura.xml
dotnet tool restore
VerifySuccessExitCode

dotnet build --configuration Release /p:VersionSuffix=$versionSuffix
dotnet build --configuration Release
VerifySuccessExitCode

dotnet test --no-build --configuration Release --verbosity quiet --collect:"XPlat Code Coverage"
Expand All @@ -25,5 +23,5 @@ VerifySuccessExitCode
dotnet reportgenerator -reports:**\coverage.cobertura.xml -targetdir:artifacts\coverage -filefilters:-*.g.cs
VerifySuccessExitCode

dotnet pack --no-build --configuration Release --output artifacts/packages /p:VersionSuffix=$versionSuffix
dotnet pack --no-build --configuration Release --output artifacts/packages
VerifySuccessExitCode
2 changes: 1 addition & 1 deletion CSharpGuidelinesAnalyzer.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<cSharpGuidelinesAnalyzerSettings>
<setting rule="AV1561" name="MaxParameterCount" value="6" />
<setting rule="AV1561" name="MaxConstructorParameterCount" value="13" />
<setting rule="AV1561" name="MaxConstructorParameterCount" value="15" />
</cSharpGuidelinesAnalyzerSettings>
4 changes: 3 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<AnalysisMode>Recommended</AnalysisMode>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
<RunSettingsFilePath>$(MSBuildThisFileDirectory)tests.runsettings</RunSettingsFilePath>
<JsonApiDotNetCoreVersionPrefix>5.6.1</JsonApiDotNetCoreVersionPrefix>
<VersionPrefix>5.6.1</VersionPrefix>
<VersionSuffix>pre</VersionSuffix>
<OpenApiPreviewNumber>1</OpenApiPreviewNumber>
<NuGetAuditMode>direct</NuGetAuditMode>
<NoWarn>$(NoWarn);NETSDK1215</NoWarn>
</PropertyGroup>
Expand Down
135 changes: 135 additions & 0 deletions JsonApiDotNetCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperExample", "src\Exampl
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DapperTests", "test\DapperTests\DapperTests.csproj", "{80E322F5-5F5D-4670-A30F-02D33C2C7900}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi.Swashbuckle", "src\JsonApiDotNetCore.OpenApi.Swashbuckle\JsonApiDotNetCore.OpenApi.Swashbuckle.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi.Client.NSwag", "src\JsonApiDotNetCore.OpenApi.Client.NSwag\JsonApiDotNetCore.OpenApi.Client.NSwag.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiNSwagClientExample", "src\Examples\OpenApiNSwagClientExample\OpenApiNSwagClientExample.csproj", "{7FC5DFA3-6F66-4FD8-820D-81E93856F252}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiNSwagClientTests", "test\OpenApiNSwagClientTests\OpenApiNSwagClientTests.csproj", "{77F98215-3085-422E-B99D-4C404C2114CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiNSwagEndToEndTests", "test\OpenApiNSwagEndToEndTests\OpenApiNSwagEndToEndTests.csproj", "{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi.Client.Kiota", "src\JsonApiDotNetCore.OpenApi.Client.Kiota\JsonApiDotNetCore.OpenApi.Client.Kiota.csproj", "{617FCA5D-A2DE-4083-B373-ADCA9901059F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiKiotaClientExample", "src\Examples\OpenApiKiotaClientExample\OpenApiKiotaClientExample.csproj", "{39DEAFE8-AE29-48E5-A67D-73776D70FC82}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiKiotaEndToEndTests", "test\OpenApiKiotaEndToEndTests\OpenApiKiotaEndToEndTests.csproj", "{FD86C676-3D80-4971-8D8C-B0729B2251F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -312,6 +330,114 @@ Global
{80E322F5-5F5D-4670-A30F-02D33C2C7900}.Release|x64.Build.0 = Release|Any CPU
{80E322F5-5F5D-4670-A30F-02D33C2C7900}.Release|x86.ActiveCfg = Release|Any CPU
{80E322F5-5F5D-4670-A30F-02D33C2C7900}.Release|x86.Build.0 = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|Any CPU.Build.0 = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|x64.ActiveCfg = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|x64.Build.0 = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|x86.ActiveCfg = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|x86.Build.0 = Debug|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|Any CPU.ActiveCfg = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|Any CPU.Build.0 = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|x64.ActiveCfg = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|x64.Build.0 = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|x86.ActiveCfg = Release|Any CPU
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Release|x86.Build.0 = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|x64.ActiveCfg = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|x64.Build.0 = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|x86.ActiveCfg = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Debug|x86.Build.0 = Debug|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|Any CPU.Build.0 = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x64.ActiveCfg = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x64.Build.0 = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x86.ActiveCfg = Release|Any CPU
{B693DE14-BB28-496F-AB39-B4E674ABCA80}.Release|x86.Build.0 = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|x64.ActiveCfg = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|x64.Build.0 = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|x86.ActiveCfg = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Debug|x86.Build.0 = Debug|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|Any CPU.Build.0 = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|x64.ActiveCfg = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|x64.Build.0 = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|x86.ActiveCfg = Release|Any CPU
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}.Release|x86.Build.0 = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|x64.ActiveCfg = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|x64.Build.0 = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|x86.ActiveCfg = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Debug|x86.Build.0 = Debug|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|Any CPU.Build.0 = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|x64.ActiveCfg = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|x64.Build.0 = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|x86.ActiveCfg = Release|Any CPU
{7FC5DFA3-6F66-4FD8-820D-81E93856F252}.Release|x86.Build.0 = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|x64.ActiveCfg = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|x64.Build.0 = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|x86.ActiveCfg = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Debug|x86.Build.0 = Debug|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|Any CPU.Build.0 = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|x64.ActiveCfg = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|x64.Build.0 = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|x86.ActiveCfg = Release|Any CPU
{77F98215-3085-422E-B99D-4C404C2114CF}.Release|x86.Build.0 = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|x64.ActiveCfg = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|x64.Build.0 = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|x86.ActiveCfg = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Debug|x86.Build.0 = Debug|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|Any CPU.Build.0 = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|x64.ActiveCfg = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|x64.Build.0 = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|x86.ActiveCfg = Release|Any CPU
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225}.Release|x86.Build.0 = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|x64.ActiveCfg = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|x64.Build.0 = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|x86.ActiveCfg = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Debug|x86.Build.0 = Debug|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|Any CPU.Build.0 = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|x64.ActiveCfg = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|x64.Build.0 = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|x86.ActiveCfg = Release|Any CPU
{617FCA5D-A2DE-4083-B373-ADCA9901059F}.Release|x86.Build.0 = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|x64.ActiveCfg = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|x64.Build.0 = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|x86.ActiveCfg = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Debug|x86.Build.0 = Debug|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|Any CPU.Build.0 = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|x64.ActiveCfg = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|x64.Build.0 = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|x86.ActiveCfg = Release|Any CPU
{39DEAFE8-AE29-48E5-A67D-73776D70FC82}.Release|x86.Build.0 = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|x64.Build.0 = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|x86.ActiveCfg = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Debug|x86.Build.0 = Debug|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|Any CPU.Build.0 = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|x64.ActiveCfg = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|x64.Build.0 = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|x86.ActiveCfg = Release|Any CPU
{FD86C676-3D80-4971-8D8C-B0729B2251F6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -337,6 +463,15 @@ Global
{24B0C12F-38CD-4245-8785-87BEFAD55B00} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{C1774117-5073-4DF8-B5BE-BF7B538BD1C2} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{80E322F5-5F5D-4670-A30F-02D33C2C7900} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{71287D6F-6C3B-44B4-9FCA-E78FE3F02289} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{B693DE14-BB28-496F-AB39-B4E674ABCA80} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{7FC5DFA3-6F66-4FD8-820D-81E93856F252} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{77F98215-3085-422E-B99D-4C404C2114CF} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{3BA4F9B9-3D90-44B5-B09C-28D98E0B4225} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{617FCA5D-A2DE-4083-B373-ADCA9901059F} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
{39DEAFE8-AE29-48E5-A67D-73776D70FC82} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{FD86C676-3D80-4971-8D8C-B0729B2251F6} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A2421882-8F0A-4905-928F-B550B192F9A4}
Expand Down
4 changes: 4 additions & 0 deletions JsonApiDotNetCore.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EIfThenThrowPattern/@EntryIndexedValue">2000</s:Int64>
<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EThrowExpressionNullCheckPattern/@EntryIndexedValue">3000</s:Int64>
<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=swagger_002Ejson/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/GeneratedFilesAndFolders/=83FF097C_002DC8C6_002D477B_002D9FAB_002DDF99B84978B5_002Ff_003AReadOnlySet_002Ecs/@EntryIndexedValue">83FF097C-C8C6-477B-9FAB-DF99B84978B5/f:ReadOnlySet.cs</s:String>
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Eg_002Ejson/@EntryIndexedValue">swagger.g.json</s:String>
<s:String x:Key="/Default/CodeInspection/GeneratedCode/GeneratedFileMasks/=swagger_002Ejson/@EntryIndexedValue">swagger.json</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IdentifierHighlightingEnabled/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IncludeWarningsInSwea/@EntryValue">True</s:Boolean>
Expand Down Expand Up @@ -661,6 +664,7 @@ $left$ = $right$;</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Contoso/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Injectables/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=jsonapi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Kiota/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=linebreaks/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Microservices/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=navigations/@EntryIndexedValue">True</s:Boolean>
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ See also our [versioning policy](./VERSIONING_POLICY.md).
| | | 9 | 9 |
| master | Preview | 8 | 8, 9 |
| | | 9 | 9 |
| openapi | Experimental | 8 | 8, 9 |
| | | 9 | 9 |

## Contributing

Expand Down
1 change: 1 addition & 0 deletions docs/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"files": [
"api/**.yml",
"api/index.md",
"ext/openapi/index.md",
"getting-started/**.md",
"getting-started/**/toc.yml",
"usage/**.md",
Expand Down
Loading
Loading