-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Support .NET 10 #3283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
martincostello
wants to merge
121
commits into
master
Choose a base branch
from
dotnet-vnext
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+11,570
−1,833
Draft
Support .NET 10 #3283
Changes from 78 commits
Commits
Show all changes
121 commits
Select commit
Hold shift + click to select a range
18458de
Support .NET 10
martincostello 26d6b70
Fix test
martincostello f2cf1e5
Remove obsolete method
martincostello 7011bbc
Update to ASP.NET Core 10 preview 2
martincostello 032b1cb
Merge branch 'master' into dotnet-vnext
martincostello 6637563
Merge branch 'master' into dotnet-vnext
martincostello f3728d0
Add TODO
martincostello f515b0b
Partially fix security requirement issue
martincostello b33f174
Fix test
martincostello 2744775
Fix test
martincostello 833b8c5
Fix type tests
martincostello 8ae0a45
Fix missing descriptions
martincostello f4eb187
Refactor fix
martincostello 4b7dc56
Merge branch 'master' into dotnet-vnext
martincostello ae594aa
Merge branch 'master' into dotnet-vnext
martincostello 5b363fd
Fix package reference
martincostello fefa371
Fix xUnit1051 warnings
martincostello 1b9a9f2
Merge branch 'master' into dotnet-vnext
martincostello e5bbb15
Merge branch 'master' into dotnet-vnext
martincostello e854705
Merge branch 'master' into dotnet-vnext
martincostello 12d5cc8
Update to ASP.NET Core 10 preview 3 (#3361)
martincostello 16ff516
Update NuGet packages
martincostello e59480c
Link to issue
martincostello 0219d47
Fix typo
martincostello a0bf6d1
Fix tag serialization
martincostello 2ac06c1
Merge branch 'master' into dotnet-vnext
martincostello 3d5a1ce
Fix merge
martincostello a4fd764
Add issue reference
martincostello e4d7a34
Remove TODO
martincostello bb986ca
Fix formatting
martincostello dd0e1f7
Merge branch 'master' into dotnet-vnext
martincostello b873904
Merge branch 'master' into dotnet-vnext
martincostello 5cdb231
Merge branch 'master' into dotnet-vnext
martincostello 21acf10
Prepare for .NET 10 preview 4 (#3388)
martincostello ae180ee
Fix nullability for null schema Type
martincostello 0cc8097
Re-enable MyGet
martincostello a12688c
Merge branch 'master' into dotnet-vnext
martincostello 18f1466
Fix rebase
martincostello 5b00492
Skip failing tets
martincostello 90b940b
Update MyGet publish URL
martincostello 43f208a
Re-disable MyGet publishing
martincostello 2057457
Merge branch 'master' into dotnet-vnext
martincostello cce51db
Merge branch 'master' into dotnet-vnext
martincostello 4d7db8e
Update to Microsoft.OpenApi 2.0.0 preview 17
martincostello d02ee7d
Fix API baselines
martincostello 6e096dc
Skip failing tests
martincostello c5285f2
Use SerializeAs
martincostello 989863b
Fix build
martincostello 7cf5e82
Apply suggestions from code review
martincostello 876741f
Fix build
martincostello 966cc92
Disable failing tests
martincostello 139e858
Fix MergeWith
martincostello 91b6649
Publish packages
martincostello 2645264
Merge branch 'master' into dotnet-vnext
martincostello d16dbd7
Fix tests
martincostello 9c3bb78
Remove workaround
martincostello d6100d5
Merge branch 'master' into dotnet-vnext
martincostello 0406f22
Re-enable tests
martincostello 83d3a2b
Merge branch 'master' into dotnet-vnext
martincostello bde75c6
Merge branch 'master' into dotnet-vnext
martincostello c1f0749
Re-enable MyGet publishing
martincostello 116b045
Merge branch 'master' into dotnet-vnext
martincostello cb0fb56
Merge branch 'master' into dotnet-vnext
martincostello a32f475
Merge branch 'master' into dotnet-vnext
martincostello b979c15
Apply review suggestions
martincostello a2e4986
Workaround VS issue
martincostello 5a0d266
Fix culture-insensitive handling of numbers with [Range] (#3426)
bkoelman 9e17d0b
Merge branch 'master' into dotnet-vnext
martincostello ec4d970
Refactor method
martincostello 9e6dedf
Fix range parsing
martincostello f5b2e11
Sort AnyOf and OneOf
martincostello 22652de
Merge branch 'master' into dotnet-vnext
martincostello 6c30f2c
Update issue number
martincostello 62a266e
Merge branch 'master' into dotnet-vnext
martincostello 3f8f0a7
Merge branch 'master' into dotnet-vnext
martincostello 07f125a
Merge branch 'master' into dotnet-vnext
martincostello 2a48fa2
Merge branch 'master' into dotnet-vnext
martincostello 529a324
Refactor [Range] handling
martincostello 6c17312
Add test cases for `[Range]`
martincostello dd8b516
Refactor method to avoid round-trip
martincostello 24f5cd2
Tweak comment
martincostello 619465e
Fix comment
martincostello 6009837
Fix conversion
martincostello 80a519b
Merge branch 'master' into dotnet-vnext
martincostello 5015ee3
Merge branch 'master' into dotnet-vnext
martincostello 98247b3
Merge branch 'master' into dotnet-vnext
martincostello 3ecf154
Update snapshot
martincostello 675a1c1
Update .NET SDK to 10.0.100-preview.5.25277.114 (#3451)
github-actions[bot] 9564222
Bump Microsoft.OpenApi
martincostello 28bca91
Fix build
martincostello 3123fe1
Fix line endings
martincostello c3b594e
Merge branch 'master' into dotnet-vnext
martincostello ed9499c
Validate TypedResults is supported for ASP.NET Core 10 (#3455)
jgarciadelanoceda 3c96b7d
Support [ProducesResponseType], [Produces], and [ProducesDefaultRespo…
jgarciadelanoceda df4712f
Merge branch 'master' into dotnet-vnext
martincostello c800e7c
Remove workarounds
martincostello da8103e
Apply suggestions from code review
martincostello 4b1799a
Merge branch 'master' into dotnet-vnext
martincostello bba77f5
Fix build
martincostello 57f9e26
Merge branch 'master' into dotnet-vnext
martincostello 45fcad8
Fix package version
martincostello eb96005
Update PublicAPI baselines
martincostello 08c3a6a
Merge branch 'master' into dotnet-vnext
martincostello 12836cb
Merge branch 'master' into dotnet-vnext
martincostello fb14623
Update _SdkTasksTFM
martincostello 3b15eda
Merge branch 'master' into dotnet-vnext
martincostello 7cd4979
Merge branch 'master' into dotnet-vnext
martincostello 807b811
Merge branch 'master' into dotnet-vnext
martincostello cdfe74a
Merge branch 'master' into dotnet-vnext
martincostello c8e5aef
Merge branch 'master' into dotnet-vnext
martincostello c2bb204
Update to ASP.NET Core 10 preview.6 (#3479)
martincostello dce8eef
Update Microsoft.OpenApi to 2.0.0
martincostello 440bfbb
Merge branch 'master' into dotnet-vnext
martincostello 32aa034
Remove WithOpenApi usage
martincostello 30b1f06
Merge branch 'master' into dotnet-vnext
martincostello 041171b
Merge branch 'master' into dotnet-vnext
martincostello c358213
Remove redundant references
martincostello 96d68e9
Add UI tests for SwaggerUI and Redoc
martincostello a1aea94
Merge branch 'master' into dotnet-vnext
martincostello 9eff208
Merge branch 'master' into dotnet-vnext
martincostello 3d2aaec
Update allowed licenses
martincostello File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,44 @@ | ||
name: ossf-scorecard | ||
on: | ||
push: | ||
branches: [ master ] | ||
schedule: | ||
- cron: '0 8 * * MON' | ||
workflow_dispatch: | ||
permissions: read-all | ||
jobs: | ||
analysis: | ||
name: analysis | ||
runs-on: ubuntu-latest | ||
permissions: | ||
id-token: write | ||
security-events: write | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
with: | ||
persist-credentials: false | ||
- name: Run analysis | ||
name: ossf-scorecard | ||
|
||
on: | ||
push: | ||
branches: [ master ] | ||
schedule: | ||
- cron: '0 8 * * MON' | ||
workflow_dispatch: | ||
|
||
permissions: read-all | ||
|
||
jobs: | ||
analysis: | ||
name: analysis | ||
runs-on: ubuntu-latest | ||
|
||
permissions: | ||
id-token: write | ||
security-events: write | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
with: | ||
persist-credentials: false | ||
|
||
- name: Run analysis | ||
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2 | ||
with: | ||
publish_results: true | ||
results_file: results.sarif | ||
results_format: sarif | ||
- name: Upload artifact | ||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 | ||
with: | ||
name: SARIF | ||
path: results.sarif | ||
retention-days: 5 | ||
- name: Upload to code-scanning | ||
with: | ||
publish_results: true | ||
results_file: results.sarif | ||
results_format: sarif | ||
|
||
- name: Upload artifact | ||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 | ||
with: | ||
name: SARIF | ||
path: results.sarif | ||
retention-days: 5 | ||
|
||
- name: Upload to code-scanning | ||
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19 | ||
with: | ||
sarif_file: results.sarif | ||
with: | ||
sarif_file: results.sarif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
{ | ||
"sdk": { | ||
"version": "9.0.300", | ||
"version": "10.0.100-preview.4.25258.110", | ||
"allowPrerelease": false, | ||
"rollForward": "latestMajor" | ||
"rollForward": "latestMajor", | ||
"paths": [ ".dotnet", "$host$" ] | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
using System.Text.Json; | ||
using System.Text.Json.Nodes; | ||
|
||
namespace Swashbuckle.AspNetCore; | ||
|
||
internal static class JsonExtensions | ||
{ | ||
private static readonly JsonSerializerOptions Options = new() | ||
{ | ||
#if NET9_0_OR_GREATER | ||
NewLine = "\n", | ||
#endif | ||
WriteIndented = true, | ||
}; | ||
|
||
public static string ToJson(this JsonNode value) | ||
{ | ||
var json = value.ToJsonString(Options); | ||
|
||
#if !NET9_0_OR_GREATER | ||
json = json.Replace("\r\n", "\n"); | ||
#endif | ||
|
||
return json; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,14 @@ | ||
using Microsoft.OpenApi.Models; | ||
|
||
namespace Swashbuckle.AspNetCore; | ||
|
||
internal static class JsonSchemaTypes | ||
{ | ||
public const string Array = "array"; | ||
public const string Boolean = "boolean"; | ||
public const string Integer = "integer"; | ||
public const string Number = "number"; | ||
public const string Null = "null"; | ||
public const string Object = "object"; | ||
public const string String = "string"; | ||
public static readonly JsonSchemaType Array = JsonSchemaType.Array; | ||
public static readonly JsonSchemaType Boolean = JsonSchemaType.Boolean; | ||
public static readonly JsonSchemaType Integer = JsonSchemaType.Integer; | ||
public static readonly JsonSchemaType Number = JsonSchemaType.Number; | ||
public static readonly JsonSchemaType Null = JsonSchemaType.Null; | ||
public static readonly JsonSchemaType Object = JsonSchemaType.Object; | ||
public static readonly JsonSchemaType String = JsonSchemaType.String; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.