Closed eerhardt closed 2 weeks ago
/backport to release/8.0
Started backporting to release/8.0: https://github.com/dotnet/aspire/actions/runs/8851482483
@eerhardt backporting to release/8.0 failed, the patch most likely resulted in conflicts:
$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Set an upper bound on RabbitMQ dependency
Using index info to reconstruct a base tree...
M Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
CONFLICT (content): Merge conflict in Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Set an upper bound on RabbitMQ dependency
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 128
Please backport manually!
@eerhardt 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.
Version 7 has binary breaking changes that cause the Aspire.RabbitMQ.Client component to fail loading with a MissingMethodException.
Contributes to #3956
Microsoft Reviewers: Open in CodeFlow