Skip to content

Fix playground apps after Npgsql 9 update #7045

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.

Sign up for GitHub

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

Merged
eerhardt merged 2 commits into from
Jan 9, 2025
Merged

Fix playground apps after Npgsql 9 update #7045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56cd7f0
Fix playground apps after Npgsql 9 update
eerhardt Jan 8, 2025
565f11c
PR feedback
eerhardt Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<TestcontainersPackageVersion>4.0.0</TestcontainersPackageVersion>
<AzureProvisiongVersion>1.0.0</AzureProvisiongVersion>
<!-- The Npgsql version used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core. -->
<Npgsql8Version>8.0.6</Npgsql8Version>
Comment thread
eerhardt marked this conversation as resolved.
</PropertyGroup>
<ItemGroup>
<!-- Azure SDK for .NET dependencies -->
Expand Down
3 changes: 3 additions & 0 deletions playground/PostgresEndToEnd/PostgresEndToEnd.ApiService/PostgresEndToEnd.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
Comment thread
eerhardt marked this conversation as resolved.
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
6 changes: 5 additions & 1 deletion playground/TestShop/CatalogDb/CatalogDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>$(DefaultTargetFramework)</TargetFramework>
Expand All @@ -13,6 +13,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>

</Project>
7 changes: 3 additions & 4 deletions playground/TestShop/CatalogModel/CatalogModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions playground/TestShop/CatalogService/CatalogService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<Content Include="Images\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" ExcludeFromSingleFile="true" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CatalogModel\CatalogModel.csproj" />
<ProjectReference Include="..\TestShop.ServiceDefaults\TestShop.ServiceDefaults.csproj" />

<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
Copy link
Copy Markdown
Member

@joperezr joperezr Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: should we consider doing the override in a single place (like a directory.build.props so all of these testshop projects can benefit) and that way we reduce the number of places that need to be updated come .net 10?

Copy link
Copy Markdown
Member Author

@eerhardt eerhardt Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should only override the PackageRefernce if the app is also referencing Npgsql EF Core. There are only a handful of playground apps use it. We can't do it in a single place without affecting the projects that don't want it.

The real problem here is transitive pinning. Since most projects want Npgsql v9, we use that in our Directory.Packages.props (even when targeting net8 - see #6946). But when an app is targeting net8 -> it needs EF Core 8. And if it uses EF Core 8 -> it needs Ngpsql 8.

<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions playground/bicep/BicepSample.ApiService/BicepSample.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<AspireProjectOrPackageReference Include="Aspire.Microsoft.Azure.Cosmos" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
<AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
<AspireProjectOrPackageReference Include="Aspire.StackExchange.Redis" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions playground/cdk/CdkSample.ApiService/CdkSample.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" />
<AspireProjectOrPackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" />
<AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
<AspireProjectOrPackageReference Include="Aspire.StackExchange.Redis" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />

Expand Down
3 changes: 3 additions & 0 deletions playground/waitfor/WaitForSandbox.ApiService/WaitForSandbox.ApiService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
<ProjectReference Include="..\WaitForSandbox.Common\WaitForSandbox.Common.csproj" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions playground/waitfor/WaitForSandbox.DbSetup/WaitForSandbox.DbSetup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Components\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL\Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj" />
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
<ProjectReference Include="..\WaitForSandbox.Common\WaitForSandbox.Common.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Update="Npgsql.DependencyInjection" VersionOverride="8.0.6" />
<PackageReference Update="Npgsql.OpenTelemetry" VersionOverride="8.0.6" />
<PackageReference Update="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Update="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...yFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="8.0.6" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="8.0.6" />
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>

</Project>