Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita1937a3

Browse files
github-actions[bot]eerhardtjoperezr
authored
[release/13.0] Update to Npgsql 10 (#13166)
* Update to Npgsql 10* Ship stable versions now* Fix RepoTesting version---------Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
1 parent4af9992 commita1937a3

File tree

6 files changed

+23
-30
lines changed

6 files changed

+23
-30
lines changed

‎Directory.Packages.props‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
<PropertyGroup>
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
9-
<!-- The Npgsqlversion used when using Npgsql EF Core on net8. The major versions need to match between Npgsql and EF Core.-->
9+
<!-- The Npgsqlversions used when using Npgsql EF Core on net8/net9. The major versions need to match between Npgsql and EF Core.-->
1010
<Npgsql8Version>8.0.6</Npgsql8Version>
11+
<Npgsql9Version>9.0.4</Npgsql9Version>
1112
</PropertyGroup>
1213
<ItemGroup>
1314
<!-- Azure SDK for .NET dependencies-->
@@ -104,7 +105,7 @@
104105
<PackageVersionInclude="MySqlConnector.DependencyInjection"Version="2.4.0" />
105106
<PackageVersionInclude="MySqlConnector.Logging.Microsoft.Extensions.Logging"Version="2.1.0" />
106107
<PackageVersionInclude="NATS.Net"Version="2.6.11" />
107-
<PackageVersionInclude="Npgsql.DependencyInjection"Version="9.0.4" />
108+
<PackageVersionInclude="Npgsql.DependencyInjection"Version="10.0.0" />
108109
<PackageVersionInclude="OpenAI"Version="2.6.0" />
109110
<PackageVersionInclude="Oracle.EntityFrameworkCore"Version="8.23.90" /><!-- Can't update to 9.x versions as those lift up LTS versions when targeting net8-->
110111
<PackageVersionInclude="Oracle.ManagedDataAccess.OpenTelemetry"Version="23.26.0" />
@@ -121,7 +122,7 @@
121122
<PackageVersionInclude="Semver"Version="3.0.0" />
122123
<PackageVersionInclude="Microsoft.DevTunnels.Connections"Version="1.3.6" />
123124
<!-- Open Telemetry-->
124-
<PackageVersionInclude="Npgsql.OpenTelemetry"Version="9.0.4" />
125+
<PackageVersionInclude="Npgsql.OpenTelemetry"Version="10.0.0" />
125126
<PackageVersionInclude="OpenTelemetry.Exporter.InMemory"Version="$(OpenTelemetryNet8Version)" />
126127
<PackageVersionInclude="OpenTelemetry.Exporter.OpenTelemetryProtocol"Version="$(OpenTelemetryNet8Version)" />
127128
<PackageVersionInclude="OpenTelemetry.Extensions.Hosting"Version="$(OpenTelemetryNet8Version)" />
@@ -251,7 +252,7 @@
251252
<PackageVersionUpdate="Microsoft.EntityFrameworkCore.Design"Version="$(MicrosoftEntityFrameworkCoreDesignPreviewVersion)" />
252253
<PackageVersionUpdate="Microsoft.EntityFrameworkCore.SqlServer"Version="$(MicrosoftEntityFrameworkCoreSqlServerPreviewVersion)" />
253254
<PackageVersionUpdate="Microsoft.EntityFrameworkCore.Tools"Version="$(MicrosoftEntityFrameworkCoreToolsPreviewVersion)" />
254-
<PackageVersionUpdate="Npgsql.EntityFrameworkCore.PostgreSQL"Version="10.0.0-rc.2" />
255+
<PackageVersionUpdate="Npgsql.EntityFrameworkCore.PostgreSQL"Version="10.0.0" />
255256
<!-- ASP.NET Core-->
256257
<PackageVersionUpdate="Microsoft.AspNetCore.Authentication.Certificate"Version="$(MicrosoftAspNetCoreAuthenticationCertificatePreviewVersion)" />
257258
<PackageVersionUpdate="Microsoft.AspNetCore.Authentication.JwtBearer"Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPreviewVersion)" />

‎src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,8 @@
77
<Description>An Azure Database for PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry.</Description>
88
<PackageIconFullPath>$(SharedDir)AzurePostgreSQL_256x.png</PackageIconFullPath>
99
<EnablePackageValidation>false</EnablePackageValidation>
10-
<!-- Temporarily we need to ship this as prerelease until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on .NET 10 stable-->
11-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1210
</PropertyGroup>
1311

14-
<ItemGroupCondition="'$(TargetFramework)' == 'net10.0'">
15-
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0-->
16-
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Relational"VersionOverride="10.0.0-rc.2.25502.107" />
17-
</ItemGroup>
18-
1912
<ItemGroup>
2013
<CompileInclude="..\Common\ManagedIdentityTokenCredentialHelpers.cs"Link="ManagedIdentityTokenCredentialHelpers.cs" />
2114
<CompileInclude="..\Common\EntityFrameworkUtils.cs"Link="EntityFrameworkUtils.cs" />
@@ -32,5 +25,9 @@
3225
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql8Version)" />
3326
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql8Version)" />
3427
</ItemGroup>
28+
<ItemGroupCondition="'$(TargetFramework)' == 'net9.0'">
29+
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql9Version)" />
30+
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql9Version)" />
31+
</ItemGroup>
3532

3633
</Project>

‎src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<PackageTags>$(ComponentEfCorePackageTags) postgressql postgres npgsql sql</PackageTags>
77
<Description>A PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry.</Description>
88
<PackageIconFullPath>$(SharedDir)PostgreSQL_logo.3colors.540x557.png</PackageIconFullPath>
9-
<!-- Temporarily we need to ship this as prerelease until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on .NET 10 stable-->
10-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
119
</PropertyGroup>
1210

1311
<ItemGroup>
@@ -18,11 +16,6 @@
1816
<CompileInclude="..\Common\EntityFrameworkUtils.cs"Link="EntityFrameworkUtils.cs" />
1917
</ItemGroup>
2018

21-
<ItemGroupCondition="'$(TargetFramework)' == 'net10.0'">
22-
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0-->
23-
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Relational"VersionOverride="10.0.0-rc.2.25502.107" />
24-
</ItemGroup>
25-
2619
<ItemGroup>
2720
<PackageReferenceInclude="Microsoft.Extensions.Configuration.Binder" />
2821
<PackageReferenceInclude="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
@@ -39,5 +32,9 @@
3932
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql8Version)" />
4033
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql8Version)" />
4134
</ItemGroup>
35+
<ItemGroupCondition="'$(TargetFramework)' == 'net9.0'">
36+
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql9Version)" />
37+
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql9Version)" />
38+
</ItemGroup>
4239

4340
</Project>

‎tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@
2222
<PackageReferenceInclude="Testcontainers.PostgreSQL" />
2323
</ItemGroup>
2424

25-
<ItemGroupCondition="'$(TargetFramework)' == 'net10.0'">
26-
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0-->
27-
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Relational"VersionOverride="10.0.0-rc.2.25502.107" />
28-
</ItemGroup>
29-
3025
<!-- Npgsql EF needs to match the same major version as the underlying Npgsql assemblies.-->
3126
<!-- This is to override CentralPackageTransitivePinningEnabled-->
3227
<ItemGroupCondition="'$(TargetFramework)' == 'net8.0'">
3328
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql8Version)" />
3429
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql8Version)" />
3530
</ItemGroup>
31+
<ItemGroupCondition="'$(TargetFramework)' == 'net9.0'">
32+
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql9Version)" />
33+
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql9Version)" />
34+
</ItemGroup>
3635

3736
</Project>

‎tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<ProjectReferenceInclude="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />
1717
</ItemGroup>
1818

19-
<ItemGroupCondition="'$(TargetFramework)' == 'net10.0'">
20-
<!-- Temporary until Npgsql.EntityFrameworkCore.PostgreSQL ships a stable version that depends on 10.0-->
21-
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Relational"VersionOverride="10.0.0-rc.2.25502.107" />
22-
</ItemGroup>
23-
2419
<ItemGroup>
2520
<PackageReferenceInclude="Microsoft.DotNet.RemoteExecutor" />
2621
<PackageReferenceInclude="Testcontainers.PostgreSQL" />
@@ -32,5 +27,9 @@
3227
<PackageReferenceInclude="Npgsql.DependencyInjection"VersionOverride="$(Npgsql8Version)" />
3328
<PackageReferenceInclude="Npgsql.OpenTelemetry"VersionOverride="$(Npgsql8Version)" />
3429
</ItemGroup>
30+
<ItemGroupCondition="'$(TargetFramework)' == 'net9.0'">
31+
<PackageVersionUpdate="Npgsql.DependencyInjection"Version="$(Npgsql9Version)" />
32+
<PackageVersionUpdate="Npgsql.OpenTelemetry"Version="$(Npgsql9Version)" />
33+
</ItemGroup>
3534

3635
</Project>

‎tests/Shared/RepoTesting/Directory.Packages.Helix.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageVersionInclude="Aspire.Azure.Security.KeyVault"Version="13.0.1" />
1212
<PackageVersionInclude="Aspire.Azure.Storage.Blobs"Version="13.0.1" />
1313
<PackageVersionInclude="Aspire.Azure.Storage.Queues"Version="13.0.1" />
14-
<PackageVersionInclude="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL"Version="$(PackageVersion)" />
14+
<PackageVersionInclude="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL"Version="13.0.1" />
1515
<PackageVersionInclude="Aspire.Confluent.Kafka"Version="13.0.1" />
1616
<PackageVersionInclude="Aspire.Hosting"Version="13.0.1" />
1717
<PackageVersionInclude="Aspire.Hosting.AppHost"Version="13.0.1" />
@@ -68,7 +68,7 @@
6868
<PackageVersionInclude="Aspire.MySqlConnector"Version="13.0.1" />
6969
<PackageVersionInclude="Aspire.NATS.Net"Version="13.0.1" />
7070
<PackageVersionInclude="Aspire.Npgsql"Version="13.0.1" />
71-
<PackageVersionInclude="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL"Version="$(PackageVersion)" />
71+
<PackageVersionInclude="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL"Version="13.0.1" />
7272
<PackageVersionInclude="Aspire.Oracle.EntityFrameworkCore"Version="13.0.1" />
7373
<PackageVersionInclude="Aspire.Pomelo.EntityFrameworkCore.MySql"Version="13.0.1" />
7474
<PackageVersionInclude="Aspire.Qdrant.Client"Version="13.0.1" />

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp