Skip to content

Replace Pomelo.EntityFrameworkCore.MySql with Microting.EntityFrameworkCore.MySql for .NET 10+ #357

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
witskeeper merged 8 commits into from
Jul 29, 2026
Merged

Replace Pomelo.EntityFrameworkCore.MySql with Microting.EntityFrameworkCore.MySql for .NET 10+ #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0695237
Initial plan
Copilot Jul 16, 2026
79bb3b3
Replace Pomelo with Microting.EntityFrameworkCore.MySql for .NET 10+
Copilot Jul 16, 2026
8f0ced0
Clean up: remove PomeloVersion from net10.0 and make PackageVersion c…
Copilot Jul 16, 2026
a65b4c6
Fix net10.0 CI: upgrade ShardingCore to 7.10.2.1 for EF Core 10 compa…
Copilot Jul 16, 2026
12d533c
Fix: clear CurrentTransaction before CommitAsync to prevent rollback-…
Copilot Jul 16, 2026
7ba9c56
修复: 优化事务提交逻辑，移除多余的事务变量赋值
witskeeper Jul 17, 2026
e1833fc
修复: 更新 ShardingCore 版本并移除不必要的数据库提供者
witskeeper Jul 29, 2026
5777a7f
更新: 将版本前缀从 3.3.0 更新为 3.4.0
witskeeper Jul 29, 2026
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: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<EntityFrameworkVersion>8.0.10</EntityFrameworkVersion>
<NpgsqlEntityFrameworkCorePostgreSQLVersion>8.0.4</NpgsqlEntityFrameworkCorePostgreSQLVersion>
<PomeloVersion>8.0.2</PomeloVersion>
<ShardingCoreVersion>7.8.1.24</ShardingCoreVersion>
<ShardingCoreVersion>7.8.2.2</ShardingCoreVersion>
<CapVersion>8.3.5</CapVersion>
<GaussDBEntityFrameworkCoreVersion>8.0.2</GaussDBEntityFrameworkCoreVersion>
<KingbaseESEntityFrameworkCoreVersion>8.0.1</KingbaseESEntityFrameworkCoreVersion>
Expand All @@ -22,7 +22,7 @@
<EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>
<NpgsqlEntityFrameworkCorePostgreSQLVersion>9.0.1</NpgsqlEntityFrameworkCorePostgreSQLVersion>
<PomeloVersion>9.0.0</PomeloVersion>
<ShardingCoreVersion>7.9.1.24</ShardingCoreVersion>
<ShardingCoreVersion>7.9.2.2</ShardingCoreVersion>
<CapVersion>8.4.1</CapVersion>
<GaussDBEntityFrameworkCoreVersion>9.0.0</GaussDBEntityFrameworkCoreVersion>
<KingbaseESEntityFrameworkCoreVersion>9.0.0</KingbaseESEntityFrameworkCoreVersion>
Expand All @@ -32,15 +32,15 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
<FrameworkVersion>10.0.0</FrameworkVersion>
<ExtensionsVersion>10.0.0</ExtensionsVersion>
<EntityFrameworkVersion>9.0.0</EntityFrameworkVersion>
<NpgsqlEntityFrameworkCorePostgreSQLVersion>9.0.0</NpgsqlEntityFrameworkCorePostgreSQLVersion>
<PomeloVersion>9.0.0</PomeloVersion>
<ShardingCoreVersion>7.9.1.24</ShardingCoreVersion>
<EntityFrameworkVersion>10.0.10</EntityFrameworkVersion>
<NpgsqlEntityFrameworkCorePostgreSQLVersion>10.0.3</NpgsqlEntityFrameworkCorePostgreSQLVersion>
<MicrotingVersion>10.0.9</MicrotingVersion>
<ShardingCoreVersion>7.10.2.2</ShardingCoreVersion>
<CapVersion>8.4.1</CapVersion>
<GaussDBEntityFrameworkCoreVersion>9.0.0</GaussDBEntityFrameworkCoreVersion>
<KingbaseESEntityFrameworkCoreVersion>9.0.0</KingbaseESEntityFrameworkCoreVersion>
<GaussDBEntityFrameworkCoreVersion>10.0.0</GaussDBEntityFrameworkCoreVersion>
<KingbaseESEntityFrameworkCoreVersion>10.0.0</KingbaseESEntityFrameworkCoreVersion>
<DMDBEntityFrameworkCoreVersion>9.0.0.37033</DMDBEntityFrameworkCoreVersion>
<MongoDBEntityFrameworkCoreVersion>9.0.3</MongoDBEntityFrameworkCoreVersion>
<MongoDBEntityFrameworkCoreVersion>10.0.2</MongoDBEntityFrameworkCoreVersion>
</PropertyGroup>
<PropertyGroup>
<NetCorePalTestcontainerVersion>1.0.1</NetCorePalTestcontainerVersion>
Expand Down Expand Up @@ -89,7 +89,8 @@
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EntityFrameworkVersion)" PrivateAssets="All" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion)" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloVersion)" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloVersion)" Condition="'$(PomeloVersion)' != ''" />
<PackageVersion Include="Microting.EntityFrameworkCore.MySql" Version="$(MicrotingVersion)" Condition="'$(MicrotingVersion)' != ''" />
<PackageVersion Include="DotNetCore.EntityFrameworkCore.GaussDB" Version="$(GaussDBEntityFrameworkCoreVersion)" />
<PackageVersion Include="DotNetCore.EntityFrameworkCore.KingbaseES" Version="$(KingbaseESEntityFrameworkCoreVersion)" />
<PackageVersion Include="DM.Microsoft.EntityFrameworkCore" Version="$(DMDBEntityFrameworkCoreVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion eng/versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<VersionPrefix>3.3.0</VersionPrefix>
<VersionPrefix>3.4.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion ...Pal.Extensions.DistributedTransactions.CAP.MongoDB.UnitTests/NetCorePalStorageMockHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion ....MySql.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
<PackageReference Include="coverlet.collector" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Microting.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
Expand Down
3 changes: 2 additions & 1 deletion ....UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Microting.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Testcontainers.MySql" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion ...eworkCore.UnitTests/NetCorePal.Extensions.Repository.EntityFrameworkCore.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Microting.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Testcontainers.MySql" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion ...Pal.Extensions.ShardingCore.UnitTests/NetCorePal.Extensions.ShardingCore.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<PackageReference Include="xunit.runner.visualstudio"/>
<PackageReference Include="Testcontainers.MySql" />
<PackageReference Include="Testcontainers.RabbitMq" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Microting.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net10.0'" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
</ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -14,7 +19,7 @@
private readonly IShardingRuntimeContext _shardingRuntimeContext;


public ShardingMySqlMigrationsSqlGenerator(IShardingRuntimeContext shardingRuntimeContext, MigrationsSqlGeneratorDependencies dependencies, ICommandBatchPreparer commandBatchPreparer, IMySqlOptions options) : base(dependencies, commandBatchPreparer, options)

Check warning on line 22 in test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs

View workflow job for this annotation

GitHub Actions / test / test-general (net9.0) 

Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal.IMySqlOptions is an internal API that supports the Entity Framework Core infrastructure and not subject to the same compatibility standards as public APIs. It may be changed or removed without notice in any release.

Check warning on line 22 in test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs

View workflow job for this annotation

GitHub Actions / test / test-general (net8.0) 

Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal.IMySqlOptions is an internal API that supports the Entity Framework Core infrastructure and not subject to the same compatibility standards as public APIs. It may be changed or removed without notice in any release.

Check warning on line 22 in test/NetCorePal.Extensions.ShardingCore.UnitTests/ShardingMySqlMigrationsSqlGenerator.cs

View workflow job for this annotation

GitHub Actions / test / test-general (net10.0) 

Microting.EntityFrameworkCore.MySql.Infrastructure.Internal.IMySqlOptions is an internal API that supports the Entity Framework Core infrastructure and not subject to the same compatibility standards as public APIs. It may be changed or removed without notice in any release.
{
_shardingRuntimeContext = shardingRuntimeContext;
}
Expand All @@ -31,4 +36,4 @@
MigrationHelper.Generate(_shardingRuntimeContext, operation, builder, Dependencies.SqlGenerationHelper, addCmds);
}
}
}
}
3 changes: 2 additions & 1 deletion test/NetCorePal.Web/NetCorePal.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
<PackageReference Include="Swashbuckle.AspNetCore" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' != 'net10.0'" />
<PackageReference Include="Microting.EntityFrameworkCore.MySql" Condition="'$(TargetFramework)' == 'net10.0'" />
<ProjectReference Include="..\..\src\NetCorePal.Extensions.DistributedTransactions.CAP.MySql\NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading