Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<!-- The Npgsql version used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core. -->
<!-- The Npgsql versions used when using Npgsql EF Core on net8/net9. The major versions need to match between Npgsql and EF Core. -->
<Npgsql8Version>8.0.6</Npgsql8Version>
<Npgsql9Version>9.0.4</Npgsql9Version>
</PropertyGroup>
<ItemGroup>
<!-- Azure SDK for .NET dependencies -->
Expand Down Expand Up @@ -104,7 +105,7 @@
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.4.0" />
<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" />
<PackageVersion Include="OpenAI" Version="2.6.0" />
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.90" /> <!-- Can't update to 9.x versions as those lift up LTS versions when targeting net8 -->
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.26.0" />
Expand All @@ -121,7 +122,7 @@
<PackageVersion Include="Semver" Version="3.0.0" />
<PackageVersion Include="Microsoft.DevTunnels.Connections" Version="1.3.6" />
<!-- Open Telemetry -->
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.4" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="10.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryNet8Version)" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryNet8Version)" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryNet8Version)" />
Expand Down Expand Up @@ -251,7 +252,7 @@
<PackageVersion Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPreviewVersion)" />
<PackageVersion Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPreviewVersion)" />
<PackageVersion Update="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPreviewVersion)" />
<PackageVersion Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.2" />
<PackageVersion Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
<!-- ASP.NET Core -->
<PackageVersion Update="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCoreAuthenticationCertificatePreviewVersion)" />
<PackageVersion Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPreviewVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@
<Description>An Azure Database for PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry.</Description>
<PackageIconFullPath>$(SharedDir)AzurePostgreSQL_256x.png</PackageIconFullPath>
<EnablePackageValidation>false</EnablePackageValidation>
<!-- Temporarily we need to ship this as prerelease until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on .NET 10 stable -->
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0 -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="10.0.0-rc.2.25502.107" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Common\ManagedIdentityTokenCredentialHelpers.cs" Link="ManagedIdentityTokenCredentialHelpers.cs" />
<Compile Include="..\Common\EntityFrameworkUtils.cs" Link="EntityFrameworkUtils.cs" />
Expand All @@ -32,5 +25,9 @@
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql8Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql8Version)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql9Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql9Version)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<PackageTags>$(ComponentEfCorePackageTags) postgressql postgres npgsql sql</PackageTags>
<Description>A PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry.</Description>
<PackageIconFullPath>$(SharedDir)PostgreSQL_logo.3colors.540x557.png</PackageIconFullPath>
<!-- Temporarily we need to ship this as prerelease until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on .NET 10 stable -->
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,11 +16,6 @@
<Compile Include="..\Common\EntityFrameworkUtils.cs" Link="EntityFrameworkUtils.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0 -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="10.0.0-rc.2.25502.107" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
Expand All @@ -39,5 +32,9 @@
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql8Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql8Version)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql9Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql9Version)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@
<PackageReference Include="Testcontainers.PostgreSQL" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0 -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="10.0.0-rc.2.25502.107" />
</ItemGroup>

<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies. -->
<!-- This is to override CentralPackageTransitivePinningEnabled -->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql8Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql8Version)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql9Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql9Version)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0 -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="10.0.0-rc.2.25502.107" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
<PackageReference Include="Testcontainers.PostgreSQL" />
Expand All @@ -32,5 +27,9 @@
<PackageReference Include="Npgsql.DependencyInjection" VersionOverride="$(Npgsql8Version)" />
<PackageReference Include="Npgsql.OpenTelemetry" VersionOverride="$(Npgsql8Version)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Npgsql.DependencyInjection" Version="$(Npgsql9Version)" />
<PackageVersion Update="Npgsql.OpenTelemetry" Version="$(Npgsql9Version)" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions tests/Shared/RepoTesting/Directory.Packages.Helix.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="13.0.1" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="13.0.1" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="13.0.1" />
<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.0.1" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="13.0.1" />
<PackageVersion Include="Aspire.Hosting" Version="13.0.1" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.1" />
Expand Down Expand Up @@ -68,7 +68,7 @@
<PackageVersion Include="Aspire.MySqlConnector" Version="13.0.1" />
<PackageVersion Include="Aspire.NATS.Net" Version="13.0.1" />
<PackageVersion Include="Aspire.Npgsql" Version="13.0.1" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.0.1" />
<PackageVersion Include="Aspire.Oracle.EntityFrameworkCore" Version="13.0.1" />
<PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="13.0.1" />
<PackageVersion Include="Aspire.Qdrant.Client" Version="13.0.1" />
Expand Down