tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-03 00:55:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.0.101 - 修复 2.0 bug、net50 问题

Browse Source
This commit is contained in:
2881099
2020-11-26 20:21:36 +08:00
parent 1bbf00a3e2
commit d95524f4fe
36 changed files with 104 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 达梦数据库 Ado.net (DmProvider)</Description>

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 Firebird</Description>

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 人大金仓数据库 Ado.Net (Kdbndp)</Description>

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库 Ms Access 实现</Description>

4
Providers/FreeSql.Provider.MySql/Curd/MySqlDelete.cs
View File

@@ -44,7 +44,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -85,7 +85,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

8
Providers/FreeSql.Provider.MySql/Curd/MySqlInsert.cs
View File

@@ -59,7 +59,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -95,7 +95,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -128,7 +128,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -164,7 +164,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

4
Providers/FreeSql.Provider.MySql/Curd/MySqlUpdate.cs
View File

@@ -58,7 +58,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -139,7 +139,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

4
Providers/FreeSql.Provider.MySql/Curd/OnDuplicateKeyUpdate.cs
View File

@@ -124,7 +124,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -153,7 +153,7 @@ namespace FreeSql.MySql.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452;net451;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 MySql 5.6，Ado.Net 驱动是 MySql.Data（Oracle官方）</Description>
@@ -28,7 +28,6 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net452'">
<PackageReference Include="MySql.Data" Version="8.0.21" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net40'">
<PackageReference Include="MySql.Data" Version="6.9.12" />
</ItemGroup>

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

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net50;net45</TargetFrameworks>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>

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

@@ -98,11 +98,11 @@ public static class FreeSqlMySqlConnectorGlobalExtensions
var dt = that.ToDataTable();
if (dt.Rows.Count == 0) return;
Func<MySqlBulkCopy, Task> writeToServer = bulkCopy =>
Func<MySqlBulkCopy, Task> writeToServer = async bulkCopy =>
{
if (bulkCopyTimeout.HasValue) bulkCopy.BulkCopyTimeout = bulkCopyTimeout.Value;
bulkCopy.DestinationTableName = dt.TableName;
return bulkCopy.WriteToServerAsync(dt, cancellationToken);
await bulkCopy.WriteToServerAsync(dt, cancellationToken);
};
try

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库 Odbc 实现，基于 {Oracle}、{SQL Server}、{MySQL ODBC 8.0 Unicode Driver}、{PostgreSQL Unicode(x64)}、{DM8 ODBC Driver} 专用访问实现，以及通用 Odbc 访问所有数据库</Description>

8
Providers/FreeSql.Provider.Oracle/Curd/OracleInsert.cs
View File

@@ -186,7 +186,7 @@ namespace FreeSql.Oracle.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -210,7 +210,7 @@ namespace FreeSql.Oracle.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -255,7 +255,7 @@ namespace FreeSql.Oracle.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -279,7 +279,7 @@ namespace FreeSql.Oracle.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

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

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<TargetFrameworks>netstandard2.0;net50;net45;net40</TargetFrameworks>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 Oracle 11</Description>
@@ -25,7 +25,7 @@
<None Include="../../logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net50'">
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.100" />
</ItemGroup>

8
Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net452;net451;net45</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 PostgreSQL 9.5</Description>
@@ -30,10 +30,9 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
<PackageReference Include="Npgsql.LegacyPostgis" Version="4.1.5" />
<PackageReference Include="Npgsql.NetTopologySuite" Version="4.1.5" />
<PackageReference Include="Npgsql.LegacyPostgis" Version="4.1.6" />
<PackageReference Include="Npgsql.NetTopologySuite" Version="4.1.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45'">
<PackageReference Include="Npgsql.LegacyPostgis" Version="4.0.11" />
</ItemGroup>
@@ -41,7 +40,6 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'net452' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net45'">
<DefineConstants>net45</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461'">
<DefineConstants>nts</DefineConstants>
</PropertyGroup>

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 神舟通用数据库 7.0.8</Description>

4
Providers/FreeSql.Provider.SqlServer/Curd/SqlServerDelete.cs
View File

@@ -49,7 +49,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -95,7 +95,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

8
Providers/FreeSql.Provider.SqlServer/Curd/SqlServerInsert.cs
View File

@@ -47,7 +47,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -98,7 +98,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -131,7 +131,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -182,7 +182,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

4
Providers/FreeSql.Provider.SqlServer/Curd/SqlServerUpdate.cs
View File

@@ -57,7 +57,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{
@@ -141,7 +141,7 @@ namespace FreeSql.SqlServer.Curd
catch (Exception ex)
{
exception = ex;
throw ex;
throw;
}
finally
{

10
Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net451;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<TargetFrameworks>netstandard2.0;net50;net451;net45;net40</TargetFrameworks>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>
@@ -28,15 +28,15 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" />
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net50'">
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net50'">
<DefineConstants>microsoft</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net40'">

6
Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
View File

@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net451;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<TargetFrameworks>netstandard2.0;net50;net451;net45;net40</TargetFrameworks>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 System.Data.SqlClient + SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next</Description>
@@ -25,7 +25,7 @@
<None Include="../../logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net451'">
<ItemGroup Condition="'$(TargetFramework)' != 'net45' and '$(TargetFramework)' != 'net40'">
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
</ItemGroup>

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

@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version>
<Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现，基于 Sqlite 3.0，支持 .NetCore、.NetFramework、Xamarin</Description>