- 
                Notifications
    You must be signed in to change notification settings 
- Fork 5.2k
[QUIC] Update Windows version of MsQuic #121170
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR updates the MsQuic Schannel library version from 2.4.15 to 2.4.16, likely to incorporate bug fixes, security patches, or other improvements from the newer MsQuic release.
Key Changes
- Bumped MicrosoftNativeQuicMsQuicSchannelVersionfrom 2.4.15 to 2.4.16
| Tagging subscribers to this area: @dotnet/ncl | 
| /ba-g #121195 | 
| /backport to release/10.0 | 
| Started backporting to  | 
| @ManickaP backporting to  git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Windows version of MsQuic
Using index info to reconstruct a base tree...
M	eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
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 Update Windows version of MsQuic
Error: The process '/usr/bin/git' failed with exit code 128 | 
No description provided.