-
Notifications
You must be signed in to change notification settings - Fork 769
Update to Npgsql 10 #13164
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to Npgsql 10 #13164
Conversation
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 13164Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 13164" |
| <PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" /> | ||
| <PackageVersion Include="NATS.Net" Version="2.6.11" /> | ||
| <PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.4" /> | ||
| <PackageVersion Include="Npgsql.DependencyInjection" Version="10.0.0" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that these 2 version bumps mean Aspire.Npgsql moves from v9 to v10 across all TFMs (8, 9, and 10).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR updates Aspire to use the newly released stable Npgsql 10.0.0 packages. The update removes temporary workarounds that were needed during the RC phase and properly configures version targeting for different .NET framework versions.
- Npgsql packages updated from version 9.0.4 and 10.0.0-rc.2 to stable 10.0.0
- Adds Npgsql9Version property (9.0.4) for net9.0 target framework compatibility
- Removes temporary EF Core Relational version overrides that were needed during the RC period
- Adds net9.0 conditional package version updates to ensure major version alignment
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| Directory.Packages.props | Updates Npgsql.DependencyInjection and Npgsql.OpenTelemetry to 10.0.0, updates Npgsql.EntityFrameworkCore.PostgreSQL from 10.0.0-rc.2 to 10.0.0, and adds Npgsql9Version property |
| src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj | Removes temporary EF Core Relational version override and adds net9.0 conditional for Npgsql 9.x packages |
| src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj | Removes temporary EF Core Relational version override and adds net9.0 conditional for Npgsql 9.x packages |
| tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj | Removes temporary EF Core Relational version override and adds net9.0 conditional for Npgsql 9.x packages |
| tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj | Removes temporary EF Core Relational version override and adds net9.0 conditional for Npgsql 9.x packages |
|
/backport to release/13.0 |
|
Started backporting to release/13.0: https://github.com/dotnet/aspire/actions/runs/19643097408 |
...sql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
Outdated
Show resolved
Hide resolved
...re.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
Outdated
Show resolved
Hide resolved
|
/backport to release/13.0 |
|
Started backporting to release/13.0: https://github.com/dotnet/aspire/actions/runs/19644429727 |
|
@eerhardt backporting to "release/13.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update to Npgsql 10
Using index info to reconstruct a base tree...
M Directory.Packages.props
M src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
M tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj
M tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj
Falling back to patching base and 3-way merge...
Auto-merging Directory.Packages.props
Auto-merging src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
Auto-merging tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj
Auto-merging tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj
Applying: Ship stable now
Using index info to reconstruct a base tree...
M src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
CONFLICT (content): Merge conflict in src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
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 0002 Ship stable now
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Description
Npgsql v10 is now released. This updates Aspire to the shipped versions.
cc @roji