From 164c77747af932ab6622c4a01b1a63af9b4ff694 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Tue, 12 Nov 2024 20:32:56 +0100 Subject: [PATCH] Use .NET/EF 9.0 GA --- .github/workflows/build.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- Directory.Packages.props | 4 ++-- global.json | 4 ++-- .../MigrationsInfrastructureNpgsqlTest.cs | 13 +++++++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adff570bf..fca39f9ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: pull_request: env: - dotnet_sdk_version: '9.0.100-rc.2.24474.11' + dotnet_sdk_version: '9.0.100' postgis_version: 3 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 655cd1811..c5e68a34c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,7 +27,7 @@ on: - cron: '30 22 * * 6' env: - dotnet_sdk_version: '9.0.100-rc.2.24474.11' + dotnet_sdk_version: '9.0.100' jobs: analyze: diff --git a/Directory.Packages.props b/Directory.Packages.props index 1bd68eb76..949ee8f56 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,7 +1,7 @@ - [9.0.0-rc.2.24474.1] - 9.0.0-rc.2.24473.5 + [9.0.0,10.0.0) + 9.0.0 9.0.0-preview.1-ci.20241028T080028 diff --git a/global.json b/global.json index 58f954fc2..733b653c1 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "9.0.100-rc.2.24474.11", + "version": "9.0.100", "rollForward": "latestMajor", - "allowPrerelease": true + "allowPrerelease": false } } diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs index c87d9507a..a67c241fa 100644 --- a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs @@ -7,6 +7,16 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations public class MigrationsInfrastructureNpgsqlTest(MigrationsInfrastructureNpgsqlTest.MigrationsInfrastructureNpgsqlFixture fixture) : MigrationsInfrastructureTestBase(fixture) { + // TODO: Remove once we sync to https://github.com/dotnet/efcore/pull/35106 + public override void Can_generate_no_migration_script() + { + } + + // TODO: Remove once we sync to https://github.com/dotnet/efcore/pull/35106 + public override void Can_generate_migration_from_initial_database_to_initial() + { + } + public override void Can_get_active_provider() { base.Can_get_active_provider(); @@ -159,6 +169,9 @@ public override void Can_diff_against_2_1_ASP_NET_Identity_model() // TODO: Implement } + protected override Task ExecuteSqlAsync(string value) + => ((NpgsqlTestStore)Fixture.TestStore).ExecuteNonQueryAsync(value); + public class MigrationsInfrastructureNpgsqlFixture : MigrationsInfrastructureFixtureBase { protected override ITestStoreFactory TestStoreFactory