dotnet / aspire

Tools, templates, and packages to accelerate building observable, production-ready apps
https://learn.microsoft.com/dotnet/aspire
MIT License
3.91k stars 475 forks source link

Update Npgsql EF Core integration to latest versions #6721

Closed eerhardt closed 2 days ago

eerhardt commented 3 days ago

This will allow us to ship Aspire.Npgsql.EntityFrameworkCore.PostgreSQL as stable 9.0.0. This should be backported to release/9.0.

Microsoft Reviewers: Open in CodeFlow
eerhardt commented 3 days ago

Can we also remove the following as part of this change:

https://github.com/dotnet/aspire/blob/95eec9c312612e2e20e2663eb83aeccfe5e495d3/src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj#L9-L10

Good call. Removed.

eerhardt commented 3 days ago

/backport to release/9.0

github-actions[bot] commented 3 days ago

Started backporting to release/9.0: https://github.com/dotnet/aspire/actions/runs/11903378396

github-actions[bot] commented 3 days ago

@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!

github-actions[bot] commented 3 days ago

@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.