Skip to content

Commit 35154ee

Browse files
Dotnet10 mysql - Remove all conditional builds. (#96)
* MySQL with a pamelo fork. * File was not saved. * Add a note to readme. * Remove all conditional builds. * Another fix.
1 parent 54bb8d0 commit 35154ee

3 files changed

Lines changed: 4 additions & 19 deletions

File tree

Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,4 @@
2424
<PackageIcon>icon.png</PackageIcon>
2525
<PackageReleaseNotes>https://github.com/PhenX/PhenX.EntityFrameworkCore.BulkInsert/releases</PackageReleaseNotes>
2626
</PropertyGroup>
27-
28-
<PropertyGroup>
29-
<!-- Pomelo.EntityFrameworkCore.MySql.NetTopologySuite is not yet available for .NET 10.0 -->
30-
<MysqlSupported>true</MysqlSupported>
31-
<MysqlSupported Condition="'$(TargetFramework)' == 'net10.0'">false</MysqlSupported>
32-
<DefineConstants Condition="'$(MysqlSupported)' == 'true'">$(DefineConstants);MYSQL_SUPPORTED</DefineConstants>
33-
</PropertyGroup>
3427
</Project>

tests/PhenX.EntityFrameworkCore.BulkInsert.Benchmark/PhenX.EntityFrameworkCore.BulkInsert.Benchmark.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
<PackageReference Include="linq2db.EntityFrameworkCore" Version="10.1.0" />
3333
</ItemGroup>
3434

35-
<ItemGroup Label="Exclude MySql code" Condition="'$(MysqlSupported)' != 'true'">
36-
<Compile Remove="**\*MySql*.cs" />
37-
</ItemGroup>
38-
3935
<ItemGroup>
40-
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" Condition="'$(MysqlSupported)' == 'true'" />
36+
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" />
4137
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql.csproj" />
4238
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Sqlite\PhenX.EntityFrameworkCore.BulkInsert.Sqlite.csproj" />
4339
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.SqlServer\PhenX.EntityFrameworkCore.BulkInsert.SqlServer.csproj" />

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,21 @@
4343
<ItemGroup Label="NetTopologySuite net9.0" Condition="'$(TargetFramework)' == 'net9.0'">
4444
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="9.0.9" />
4545
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.4" />
46-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="9.0.0" />
46+
<PackageReference Include="Microting.EntityFrameworkCore.MySql.NetTopologySuite" Version="9.0.8" />
4747
</ItemGroup>
4848

4949
<ItemGroup Label="NetTopologySuite net10.0" Condition="'$(TargetFramework)' == 'net10.0'">
5050
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="10.0.2" />
5151
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="10.0.0" />
52-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="10.0.0" Condition="'$(MysqlSupported)' == 'true'" />
52+
<PackageReference Include="Microting.EntityFrameworkCore.MySql.NetTopologySuite" Version="10.0.5" />
5353
</ItemGroup>
5454

5555
<ItemGroup Label="Specific dependencies">
5656
<PackageReference Include="Ardalis.SmartEnum.EFCore" Version="8.2.0" />
5757
</ItemGroup>
5858

59-
<ItemGroup Label="Exclude MySql code" Condition="'$(MysqlSupported)' != 'true'">
60-
<Compile Remove="**\*MySql*.cs" />
61-
</ItemGroup>
62-
6359
<ItemGroup>
64-
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" Condition="'$(MysqlSupported)' == 'true'" />
60+
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" />
6561
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Oracle\PhenX.EntityFrameworkCore.BulkInsert.Oracle.csproj" />
6662
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql\PhenX.EntityFrameworkCore.BulkInsert.PostgreSql.csproj" />
6763
<ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Sqlite\PhenX.EntityFrameworkCore.BulkInsert.Sqlite.csproj" />

0 commit comments

Comments
 (0)