tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 12:28:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update MySqlConnector 1.0.0

Browse Source
This commit is contained in:
28810
2020-07-19 07:22:48 +08:00
parent 7471df5924
commit 4a4647de1d
13 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
View File

@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net452'">
<PackageReference Include="MySql.Data" Version="8.0.20" />
<PackageReference Include="MySql.Data" Version="8.0.21" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40'">

6
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlAdo.cs
View File

@ -1,12 +1,16 @@
using FreeSql.Internal;
using FreeSql.Internal.Model;
using MySql.Data.MySqlClient;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections;
using System.Data.Common;
using System.Text;
using System.Threading;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
namespace FreeSql.MySql
{

8
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
View File

@ -1,5 +1,4 @@
using MySql.Data.MySqlClient;
using FreeSql.Internal.ObjectPool;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@ -7,6 +6,11 @@ using System.Data;
using System.Data.Common;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
namespace FreeSql.MySql
{

6
Providers/FreeSql.Provider.MySql/MySqlCodeFirst.cs
View File

@ -1,12 +1,16 @@
using FreeSql.Internal;
using FreeSql.Internal.Model;
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
namespace FreeSql.MySql
{

6
Providers/FreeSql.Provider.MySql/MySqlDbFirst.cs
View File

@ -1,13 +1,17 @@
using FreeSql.DatabaseModel;
using FreeSql.Internal;
using FreeSql.Internal.Model;
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
namespace FreeSql.MySql
{

4
Providers/FreeSql.Provider.MySql/MySqlUtils.cs
View File

@ -1,6 +1,10 @@
using FreeSql.Internal;
using FreeSql.Internal.Model;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
using System;
using System.Collections.Generic;
using System.Data.Common;

7
Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
View File

@ -26,13 +26,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MySqlConnector" Version="0.69.4" />
<PackageReference Include="MySqlConnector" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="../FreeSql.Provider.MySql/**/*.cs" Exclude="../FreeSql.Provider.MySql/obj/**/*" />
</ItemGroup>
<ItemGroup>
<Compile Remove="..\FreeSql.Provider.MySql\MySqlUtils.cs" />
</ItemGroup>
@ -40,5 +39,9 @@
<ItemGroup>
<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
</ItemGroup>
<PropertyGroup>
<DefineConstants>MySqlConnector</DefineConstants>
</PropertyGroup>
</Project>

6
Providers/FreeSql.Provider.MySqlConnector/FreeSqlMySqlConnectorGlobalExtensions.cs
View File

@ -1,9 +1,13 @@
using FreeSql;
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
#if MySqlConnector
using MySqlConnector;
#else
using MySql.Data.MySqlClient;
#endif
public static class FreeSqlMySqlConnectorGlobalExtensions
{

2
Providers/FreeSql.Provider.MySqlConnector/MySqlConnectorUtils.cs
View File

@ -1,6 +1,6 @@
using FreeSql.Internal;
using FreeSql.Internal.Model;
using MySql.Data.MySqlClient;
using MySqlConnector;
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;

4
Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
View File

@ -26,11 +26,11 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.70" />
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.80" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40'">
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.7.0" />
<PackageReference Include="Oracle.ManagedDataAccess" Version="19.8.0" />
</ItemGroup>
<ItemGroup>