Update jquery-validation to v1.19.5 #50467
Merged
Conversation
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
ghost
added
the
area-mvc
mkArtakMSFT
approved these changes
Sep 1, 2023
Contributor
mkArtakMSFT
left a comment
mkArtakMSFT
left a comment
There was a problem hiding this comment.
Thank you, @MackinnonBuck !
Member
Author
|
/backport to release/8.0 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/6054442483 |
Member
Author
|
/backport to release/7.0 |
Contributor
|
Started backporting to release/7.0: https://github.com/dotnet/aspnetcore/actions/runs/6054461757 |
Member
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/6054490291 |
Contributor
|
@MackinnonBuck backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update jquery-validation to v1.19.5
Using index info to reconstruct a base tree...
M src/Identity/UI/src/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml
M src/Identity/UI/src/Areas/Identity/Pages/V5/_ValidationScriptsPartial.cshtml
M src/Identity/UI/src/THIRD-PARTY-NOTICES.txt
M src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml
M src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml
M src/ProjectTemplates/THIRD-PARTY-NOTICES
M src/Security/samples/ClaimsTransformation/bower.json
M src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/.bower.json
M src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/LICENSE.txt
M src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/dist/jquery.min.map
M src/Security/samples/Cookies/bower.json
M src/Security/samples/Cookies/wwwroot/lib/jquery/.bower.json
M src/Security/samples/Cookies/wwwroot/lib/jquery/LICENSE.txt
M src/Security/samples/Cookies/wwwroot/lib/jquery/dist/jquery.min.map
M src/Security/samples/PathSchemeSelection/bower.json
M src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/.bower.json
M src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/LICENSE.txt
M src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/dist/jquery.min.map
Falling back to patching base and 3-way merge...
Auto-merging src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/dist/jquery.min.map
CONFLICT (content): Merge conflict in src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/dist/jquery.min.map
Auto-merging src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/LICENSE.txt
CONFLICT (content): Merge conflict in src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/LICENSE.txt
Auto-merging src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/.bower.json
CONFLICT (content): Merge conflict in src/Security/samples/PathSchemeSelection/wwwroot/lib/jquery/.bower.json
Auto-merging src/Security/samples/PathSchemeSelection/bower.json
CONFLICT (content): Merge conflict in src/Security/samples/PathSchemeSelection/bower.json
Auto-merging src/Security/samples/Cookies/wwwroot/lib/jquery/dist/jquery.min.map
CONFLICT (content): Merge conflict in src/Security/samples/Cookies/wwwroot/lib/jquery/dist/jquery.min.map
Auto-merging src/Security/samples/Cookies/wwwroot/lib/jquery/LICENSE.txt
CONFLICT (content): Merge conflict in src/Security/samples/Cookies/wwwroot/lib/jquery/LICENSE.txt
Auto-merging src/Security/samples/Cookies/wwwroot/lib/jquery/.bower.json
CONFLICT (content): Merge conflict in src/Security/samples/Cookies/wwwroot/lib/jquery/.bower.json
Auto-merging src/Security/samples/Cookies/bower.json
CONFLICT (content): Merge conflict in src/Security/samples/Cookies/bower.json
Auto-merging src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/dist/jquery.min.map
CONFLICT (content): Merge conflict in src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/dist/jquery.min.map
Auto-merging src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/LICENSE.txt
CONFLICT (content): Merge conflict in src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/LICENSE.txt
Auto-merging src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/.bower.json
CONFLICT (content): Merge conflict in src/Security/samples/ClaimsTransformation/wwwroot/lib/jquery/.bower.json
Auto-merging src/Security/samples/ClaimsTransformation/bower.json
CONFLICT (content): Merge conflict in src/Security/samples/ClaimsTransformation/bower.json
Auto-merging src/ProjectTemplates/THIRD-PARTY-NOTICES
CONFLICT (content): Merge conflict in src/ProjectTemplates/THIRD-PARTY-NOTICES
Auto-merging src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml
CONFLICT (content): Merge conflict in src/Identity/samples/IdentitySample.Mvc/Views/Shared/_ValidationScriptsPartial.cshtml
Auto-merging src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml
CONFLICT (content): Merge conflict in src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_ValidationScriptsPartial.cshtml
Auto-merging src/Identity/UI/src/THIRD-PARTY-NOTICES.txt
CONFLICT (content): Merge conflict in src/Identity/UI/src/THIRD-PARTY-NOTICES.txt
Auto-merging src/Identity/UI/src/Areas/Identity/Pages/V5/_ValidationScriptsPartial.cshtml
Auto-merging src/Identity/UI/src/Areas/Identity/Pages/V4/_ValidationScriptsPartial.cshtml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update jquery-validation to v1.19.5
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@MackinnonBuck an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
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.
Update jquery-validation to v1.19.5
Part of #50421