Skip to content

[QUIC] Update MsQuic library version#113159

Merged
ManickaP merged 1 commit into
dotnet:mainfrom
ManickaP:msquic-update
Mar 6, 2025
Merged

[QUIC] Update MsQuic library version#113159
ManickaP merged 1 commit into
dotnet:mainfrom
ManickaP:msquic-update

Conversation

@ManickaP

@ManickaP ManickaP commented Mar 5, 2025

Copy link
Copy Markdown
Member

Contributes to #113136

Copilot AI review requested due to automatic review settings March 5, 2025 11:57

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.

@ghost ghost added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Mar 5, 2025
@ManickaP ManickaP added area-System.Net.Quic and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Mar 5, 2025
@ManickaP ManickaP requested a review from a team March 5, 2025 11:57
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

@wfurt wfurt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ManickaP

ManickaP commented Mar 5, 2025

Copy link
Copy Markdown
Member Author

/backport to release/8.0-staging

@github-actions

github-actions Bot commented Mar 5, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/13675520097

@github-actions

github-actions Bot commented Mar 5, 2025

Copy link
Copy Markdown
Contributor

@ManickaP backporting to "release/8.0-staging" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Update MsQuic library version
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 MsQuic library version
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@ManickaP

ManickaP commented Mar 6, 2025

Copy link
Copy Markdown
Member Author

/ba-g dotnet/dnceng#5149

@ManickaP ManickaP merged commit 78142b0 into dotnet:main Mar 6, 2025
@ManickaP ManickaP deleted the msquic-update branch March 6, 2025 09:43
@ManickaP

ManickaP commented Mar 6, 2025

Copy link
Copy Markdown
Member Author

/backport to release/9.0-staging

@github-actions

github-actions Bot commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/13695765432

@karelz karelz added this to the 10.0.0 milestone Mar 7, 2025
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants