Fix OpenApiJsonSchema array parsing#62051
Merged
BrennanConroy merged 2 commits intomainfrom May 27, 2025
Merged
Conversation
captainsafia
approved these changes
May 21, 2025
Contributor
captainsafia
left a comment
There was a problem hiding this comment.
LGTM! Comment inline about possibly adding coverage for custom converts that emit objects instead of arrays.
...NetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
Show resolved
Hide resolved
Member
Author
|
/backport to release/9.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/15282951411 |
Contributor
|
@BrennanConroy backporting to "release/9.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix OpenApiJsonSchema array parsing
Using index info to reconstruct a base tree...
M src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
M src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
Falling back to patching base and 3-way merge...
Auto-merging src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
Auto-merging src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
CONFLICT (content): Merge conflict in src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix OpenApiJsonSchema array parsing
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
BrennanConroy
added a commit
that referenced
this pull request
May 27, 2025
10 tasks
wtgodbe
pushed a commit
that referenced
this pull request
Jun 4, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #62023
We weren't reading before calling the recursive function which meant we'd never advance the
Utf8JsonReaderand always be in the statereader.TokenType == JsonTokenType.StartArray