diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f61d923f..5aff4c48 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: strategy: matrix: framework: [net8.0, net9.0, net10.0] - provider: [DMDB, GaussDB, KingbaseES, MongoDB, MySql, PostgreSql, Sqlite, SqlServer, Base] + provider: [KingbaseES, MongoDB, MySql, PostgreSql, Sqlite, SqlServer, Base] steps: - uses: actions/checkout@v3 - name: Setup .NET diff --git a/Directory.Packages.props b/Directory.Packages.props index b6978453..bbe823e8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ 8.0.10 8.0.4 8.0.2 - 7.8.1.24 + 7.8.2.2 8.3.5 8.0.2 8.0.1 @@ -22,7 +22,7 @@ 9.0.0 9.0.1 9.0.0 - 7.9.1.24 + 7.9.2.2 8.4.1 9.0.0 9.0.0 @@ -32,15 +32,15 @@ 10.0.0 10.0.0 - 9.0.0 - 9.0.0 - 9.0.0 - 7.9.1.24 + 10.0.10 + 10.0.3 + 10.0.9 + 7.10.2.2 8.4.1 - 9.0.0 - 9.0.0 + 10.0.0 + 10.0.0 9.0.0.37033 - 9.0.3 + 10.0.2 1.0.1 @@ -89,7 +89,8 @@ - + + diff --git a/eng/versions.props b/eng/versions.props index a12617c7..a246ef5c 100644 --- a/eng/versions.props +++ b/eng/versions.props @@ -1,6 +1,6 @@ - 3.3.0 + 3.4.0 diff --git a/test/NetCorePal.Extensions.DistributedTransactions.CAP.MongoDB.UnitTests/NetCorePalStorageMockHost.cs b/test/NetCorePal.Extensions.DistributedTransactions.CAP.MongoDB.UnitTests/NetCorePalStorageMockHost.cs index 7289695d..3bba801f 100644 --- a/test/NetCorePal.Extensions.DistributedTransactions.CAP.MongoDB.UnitTests/NetCorePalStorageMockHost.cs +++ b/test/NetCorePal.Extensions.DistributedTransactions.CAP.MongoDB.UnitTests/NetCorePalStorageMockHost.cs @@ -14,7 +14,6 @@ public class NetCorePalStorageMockHost : IAsyncLifetime .WithUsername("guest").WithPassword("guest").Build(); private readonly MongoDbContainer mongoDbContainer = new MongoDbBuilder() - .WithImage("mongo:8.0") .WithReplicaSet("rs0") .WithUsername("admin") .WithPassword("guest") diff --git a/test/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests.csproj b/test/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests.csproj index 7dceeb94..503bfd56 100644 --- a/test/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests.csproj +++ b/test/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests.csproj @@ -17,7 +17,8 @@ - + + diff --git a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests.csproj b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests.csproj index e562bf4b..564347c5 100644 --- a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests.csproj @@ -15,7 +15,8 @@ - + + diff --git a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests.csproj b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests.csproj index d907e74f..301d936a 100644 --- a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests.csproj @@ -15,7 +15,8 @@ - + + diff --git a/test/NetCorePal.Extensions.ShardingCore.UnitTests/NetCorePal.Extensions.ShardingCore.UnitTests.csproj b/test/NetCorePal.Extensions.ShardingCore.UnitTests/NetCorePal.Extensions.ShardingCore.UnitTests.csproj index 0de1e625..863798f0 100644 --- a/test/NetCorePal.Extensions.ShardingCore.UnitTests/NetCorePal.Extensions.ShardingCore.UnitTests.csproj +++ b/test/NetCorePal.Extensions.ShardingCore.UnitTests/NetCorePal.Extensions.ShardingCore.UnitTests.csproj @@ -18,7 +18,8 @@ - + + diff --git a/test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs b/test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs index 60d8362c..50909867 100644 --- a/test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs +++ b/test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs @@ -2,8 +2,13 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations.Operations; using Microsoft.EntityFrameworkCore.Update; +#if NET10_0_OR_GREATER +using Microting.EntityFrameworkCore.MySql.Infrastructure.Internal; +using Microting.EntityFrameworkCore.MySql.Migrations; +#else using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using Pomelo.EntityFrameworkCore.MySql.Migrations; +#endif using ShardingCore.Core.RuntimeContexts; using ShardingCore.Helpers; @@ -31,4 +36,4 @@ protected override void Generate( MigrationHelper.Generate(_shardingRuntimeContext, operation, builder, Dependencies.SqlGenerationHelper, addCmds); } } -} \ No newline at end of file +} diff --git a/test/NetCorePal.Web/NetCorePal.Web.csproj b/test/NetCorePal.Web/NetCorePal.Web.csproj index 406c0f9b..7eea92c3 100644 --- a/test/NetCorePal.Web/NetCorePal.Web.csproj +++ b/test/NetCorePal.Web/NetCorePal.Web.csproj @@ -42,7 +42,8 @@ - + +