Closed eerhardt closed 2 days ago
Can we also remove the following as part of this change:
Good call. Removed.
/backport to release/9.0
Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11903378396
@eerhardt backporting to release/9.0 failed, the patch most likely resulted in conflicts:
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update Npgsql EF Core integration to latest versions
Applying: Remove SuppressFinalPackageVersion so it ships stable
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
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 0002 Remove SuppressFinalPackageVersion so it ships stable
Error: The process '/usr/bin/git' failed with exit code 128
Please backport manually!
@eerhardt an error occurred while backporting to release/9.0, please check the run log for details!
Error: git am failed, most likely due to a merge conflict.
This will allow us to ship
Aspire.Npgsql.EntityFrameworkCore.PostgreSQL
as stable9.0.0
. This should be backported to release/9.0.Microsoft Reviewers: Open in CodeFlow