Skip to content

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Oct 21, 2024

Fixes #58532

@wtgodbe wtgodbe requested a review from a team as a code owner October 21, 2024 16:24
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 21, 2024
@wtgodbe
Copy link
Member Author

wtgodbe commented Oct 21, 2024

Need to get the package mirrored to our feed, doing that now

@wtgodbe
Copy link
Member Author

wtgodbe commented Oct 21, 2024

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@wtgodbe
Copy link
Member Author

wtgodbe commented Oct 21, 2024

/azp run

Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@wtgodbe
Copy link
Member Author

wtgodbe commented Oct 21, 2024

/backport to release/9.0

Copy link
Contributor

Started backporting to release/9/0: https://github.com/dotnet/aspnetcore/actions/runs/11448932358

Copy link
Contributor

Started backporting to release/9.0: https://github.com/dotnet/aspnetcore/actions/runs/11448933851

@wtgodbe
Copy link
Member Author

wtgodbe commented Oct 21, 2024

/backport to release/8.0

Copy link
Contributor

@wtgodbe an error occurred while backporting to release/9/0, please check the run log for details!

Error: The specified backport target branch release/9/0 wasn't found in the repo.

Copy link
Contributor

Started backporting to release/8.0: https://github.com/dotnet/aspnetcore/actions/runs/11448939638

Copy link
Contributor

@wtgodbe backporting to release/8.0 failed, the patch most likely resulted in conflicts:

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

Applying: Update Messagepack dependency
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 advice.mergeConflict false"
Patch failed at 0001 Update Messagepack dependency
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@wtgodbe an error occurred while backporting to release/8.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@wtgodbe wtgodbe merged commit 60ed115 into main Oct 21, 2024
27 checks passed
@wtgodbe wtgodbe deleted the wtgodbe-patch-1 branch October 21, 2024 21:54
@dotnet-policy-service dotnet-policy-service bot added this to the 10.0-preview1 milestone Oct 21, 2024
captainsafia pushed a commit that referenced this pull request Feb 11, 2025
* Update Messagepack dependency

* Update submodule
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework

Projects

None yet

Development

Successfully merging this pull request may close these issues.

The referenced MessagePack has a known vulnerability

1 participant