Bypass Mysql packages while Pomelo is not updated

fabien.menager · fabien.menager · commit d05477f443a8 · 2026-01-18T16:38:14.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,6 +52,9 @@ jobs:
       - name: Test net9.0
         run: dotnet test --configuration Release --no-restore --no-build --verbosity normal --framework net9.0
 
+      - name: Test net10.0
+        run: dotnet test --configuration Release --no-restore --no-build --verbosity normal --framework net10.0
+
       - name: Pack nuget packages
         run: dotnet pack --configuration Release --no-restore --no-build --output nupkgs /p:PackageVersion=$VERSION
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,5 +29,6 @@
         <!-- Pomelo.EntityFrameworkCore.MySql.NetTopologySuite is not yet available for .NET 10.0 -->
         <MysqlSupported>true</MysqlSupported>
         <MysqlSupported Condition="'$(TargetFramework)' == 'net10.0'">false</MysqlSupported>
+        <Constants Condition="'$(MysqlSupported)' == 'true'">$(Constants);MYSQL_SUPPORTED</Constants>
     </PropertyGroup>
 </Project>
diff --git a/PhenX.EntityFrameworkCore.BulkInsert.Net10.slnf b/PhenX.EntityFrameworkCore.BulkInsert.Net10.slnf
@@ -0,0 +1,14 @@
+﻿{
+  "solution": {
+    "path": "PhenX.EntityFrameworkCore.BulkInsert.slnx",
+    "projects": [
+      "src\\PhenX.EntityFrameworkCore.BulkInsert.Oracle\\PhenX.EntityFrameworkCore.BulkInsert.Oracle.csproj",
+      "src\\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql\\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql.csproj",
+      "src\\PhenX.EntityFrameworkCore.BulkInsert.Sqlite\\PhenX.EntityFrameworkCore.BulkInsert.Sqlite.csproj",
+      "src\\PhenX.EntityFrameworkCore.BulkInsert.SqlServer\\PhenX.EntityFrameworkCore.BulkInsert.SqlServer.csproj",
+      "src\\PhenX.EntityFrameworkCore.BulkInsert\\PhenX.EntityFrameworkCore.BulkInsert.csproj",
+      "tests\\PhenX.EntityFrameworkCore.BulkInsert.Benchmark\\PhenX.EntityFrameworkCore.BulkInsert.Benchmark.csproj",
+      "tests\\PhenX.EntityFrameworkCore.BulkInsert.Tests\\PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj"
+    ]
+  }
+}
diff --git a/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj b/src/PhenX.EntityFrameworkCore.BulkInsert.MySql/PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj
@@ -1,8 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks> <!-- net10.0 not supported by Pomelo.EntityFrameworkCore.MySql yet -->
-    <!-- Ignore error for preview version of Pomelo.EntityFrameworkCore.MySql -->
-    <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/LibComparator.RawInsert.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/LibComparator.RawInsert.cs
@@ -4,7 +4,9 @@
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 
+#if MYSQL_SUPPORTED
 using MySqlConnector;
+#endif
 
 using Npgsql;
 
@@ -144,6 +146,7 @@ private void RawInsertSqlServer()
         }
     }
 
+#if MYSQL_SUPPORTED
     private void RawInsertMySql()
     {
         var connection = (MySqlConnection)DbContext.Database.GetDbConnection();
@@ -196,6 +199,7 @@ private void RawInsertMySql()
             bulkCopy.WriteToServer(dataTable);
         }
     }
+#endif
 
     private void RawInsertOracle()
     {
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/LibComparator.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/LibComparator.cs
@@ -85,11 +85,13 @@ public void RawInsert()
             // Use BeginBinaryImport for PostgreSQL
             RawInsertPostgreSql();
         }
+#if MYSQL_SUPPORTED
         else if (DbContext.Database.ProviderName!.Contains("MySql", StringComparison.InvariantCultureIgnoreCase))
         {
             // Use MySqlBulkCopy for PostgreSQL
             RawInsertMySql();
         }
+#endif
         else if (DbContext.Database.ProviderName!.Contains("Oracle", StringComparison.InvariantCultureIgnoreCase))
         {
             // Use OracleBulkCopy for Oracle
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/PhenX.EntityFrameworkCore.BulkInsert.Benchmark.csproj b/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/PhenX.EntityFrameworkCore.BulkInsert.Benchmark.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net9.0;</TargetFrameworks> <!-- Override TargetFrameworks (with an s) from Directory.Build.props -->
     <IsPackable>false</IsPackable>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,8 +26,18 @@
     <PackageReference Include="linq2db.EntityFrameworkCore" Version="9.2.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="EFCore.BulkExtensions" Version="10.0.0" />
+    <PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="10.105.2" />
+    <PackageReference Include="linq2db.EntityFrameworkCore" Version="10.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Label="Exclude MySql code" Condition="'$(MysqlSupported)' != 'true'">
+    <Compile Remove="**\*MySql*.cs" />
+  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" />
+    <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" Condition="'$(MysqlSupported)' == 'true'" />
     <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql.csproj" />
     <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Sqlite\PhenX.EntityFrameworkCore.BulkInsert.Sqlite.csproj" />
     <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.SqlServer\PhenX.EntityFrameworkCore.BulkInsert.SqlServer.csproj" />
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/Program.cs b/tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/Program.cs
@@ -19,7 +19,9 @@ public static void Main(string[] args)
         // Library comparison benchmarks
         var comparators = new[]
         {
+#if MYSQL_SUPPORTED
             typeof(LibComparatorMySql),
+#endif
             typeof(LibComparatorPostgreSql),
             typeof(LibComparatorSqlite),
             typeof(LibComparatorSqlServer),
diff --git a/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj b/tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj
@@ -21,10 +21,6 @@
         <PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
     </ItemGroup>
 
-    <ItemGroup Label="Exclude MySql tests" Condition="'$(MysqlSupported)' != 'true'">
-        <Compile Remove="**\*MySql*.cs" />
-    </ItemGroup>
-
     <ItemGroup Label="Test containers">
         <PackageReference Include="Testcontainers" Version="4.7.0" />
         <PackageReference Include="Testcontainers.PostgreSql" Version="4.7.0" />
@@ -55,6 +51,10 @@
       <PackageReference Include="Ardalis.SmartEnum.EFCore" Version="8.2.0" />
     </ItemGroup>
 
+    <ItemGroup Label="Exclude MySql code" Condition="'$(MysqlSupported)' != 'true'">
+      <Compile Remove="**\*MySql*.cs" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" Condition="'$(MysqlSupported)' == 'true'" />
       <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Oracle\PhenX.EntityFrameworkCore.BulkInsert.Oracle.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`	`using Microsoft.Data.Sqlite;`
`5`	`5`	`using Microsoft.EntityFrameworkCore;`
`6`	`6`
	`7`	`+#if MYSQL_SUPPORTED`
`7`	`8`	`using MySqlConnector;`
	`9`	`+#endif`
`8`	`10`
`9`	`11`	`using Npgsql;`
`10`	`12`
`@@ -144,6 +146,7 @@ private void RawInsertSqlServer()`
`144`	`146`	`}`
`145`	`147`	`}`
`146`	`148`
	`149`	`+#if MYSQL_SUPPORTED`
`147`	`150`	`private void RawInsertMySql()`
`148`	`151`	`{`
`149`	`152`	`var connection = (MySqlConnection)DbContext.Database.GetDbConnection();`
`@@ -196,6 +199,7 @@ private void RawInsertMySql()`
`196`	`199`	`bulkCopy.WriteToServer(dataTable);`
`197`	`200`	`}`
`198`	`201`	`}`
	`202`	`+#endif`
`199`	`203`
`200`	`204`	`private void RawInsertOracle()`
`201`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,13 @@ public void RawInsert()`
`85`	`85`	`// Use BeginBinaryImport for PostgreSQL`
`86`	`86`	`RawInsertPostgreSql();`
`87`	`87`	`}`
	`88`	`+#if MYSQL_SUPPORTED`
`88`	`89`	`else if (DbContext.Database.ProviderName!.Contains("MySql", StringComparison.InvariantCultureIgnoreCase))`
`89`	`90`	`{`
`90`	`91`	`// Use MySqlBulkCopy for PostgreSQL`
`91`	`92`	`RawInsertMySql();`
`92`	`93`	`}`
	`94`	`+#endif`
`93`	`95`	`else if (DbContext.Database.ProviderName!.Contains("Oracle", StringComparison.InvariantCultureIgnoreCase))`
`94`	`96`	`{`
`95`	`97`	`// Use OracleBulkCopy for Oracle`