-
Notifications
You must be signed in to change notification settings - Fork 10.1k
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
Fix ModelMetadata for TryParse-parameters in ApiExplorer #58350
Conversation
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/11286219015 |
@captainsafia 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 ModelMetadata for TryParse-parameters in ApiExplorer
Using index info to reconstruct a base tree...
M src/OpenApi/src/Services/OpenApiDocumentService.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
CONFLICT (content): Merge conflict in src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs
Auto-merging src/OpenApi/src/Services/OpenApiDocumentService.cs
CONFLICT (content): Merge conflict in src/OpenApi/src/Services/OpenApiDocumentService.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 advice.mergeConflict false"
Patch failed at 0001 Fix ModelMetadata for TryParse-parameters in ApiExplorer
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@captainsafia an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* Fix ModelMetadata for TryParse-parameters in ApiExplorer * Add tests and update code comments * Update src/OpenApi/src/Services/OpenApiDocumentService.cs
* Fix ModelMetadata for TryParse-parameters in ApiExplorer * Add tests and update code comments * Update src/OpenApi/src/Services/OpenApiDocumentService.cs
Closes #58318.