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

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

View File

@ -3,11 +3,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<UserSecretsId>f2b3f543-99d4-4be7-b894-6df3c6cbad7e</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>dbcontext_01.xml</DocumentationFile> <DocumentationFile>dbcontext_01.xml</DocumentationFile>
<WarningLevel>3</WarningLevel>
<NoWarn>1701;1702;1591</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>BaseEntity 是一种极简单的 CodeFirst 开发方式特别对单表或多表CRUD利用继承节省了每个实体类的重复属性创建时间、ID等字段软件删除等功能进行 crud 操作时不必时常考虑仓储的使用.</Description> <Description>BaseEntity 是一种极简单的 CodeFirst 开发方式特别对单表或多表CRUD利用继承节省了每个实体类的重复属性创建时间、ID等字段软件删除等功能进行 crud 操作时不必时常考虑仓储的使用.</Description>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 扩展包可实现实体类属性为对象时以JSON形式映射存储.</Description> <Description>FreeSql 扩展包可实现实体类属性为对象时以JSON形式映射存储.</Description>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;netstandard2.1;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 扩展包,可实现【延时加载】属性.</Description> <Description>FreeSql 扩展包,可实现【延时加载】属性.</Description>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 扩展包,实现 linq queryable 和 linq to sql 语法进行开发.</Description> <Description>FreeSql 扩展包,实现 linq queryable 和 linq to sql 语法进行开发.</Description>

View File

@ -12,7 +12,7 @@
<Description>使用 FreeSql 快速生成数据库的实体类安装dotnet tool install -g FreeSql.Generator</Description> <Description>使用 FreeSql 快速生成数据库的实体类安装dotnet tool install -g FreeSql.Generator</Description>
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl> <PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl> <RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags> <PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
</PropertyGroup> </PropertyGroup>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 全家桶,懒人专用</Description> <Description>FreeSql 全家桶,懒人专用</Description>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description> <Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>

View File

@ -502,5 +502,14 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/翰高/Access, and read/write separation、and split table.</Description> <Description>FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite/Firebird/达梦/人大金仓/神舟通用/翰高/Access, and read/write separation、and split table.</Description>
<PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl> <PackageProjectUrl>https://github.com/2881099/FreeSql/wiki/Repository</PackageProjectUrl>

View File

@ -17,7 +17,7 @@
<PackageReference Include="Dapper" Version="2.0.35" /> <PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="IdleBus" Version="1.5.0" /> <PackageReference Include="IdleBus" Version="1.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

View File

@ -13,9 +13,38 @@ namespace FreeSql.Tests
{ {
public class UnitTest4 public class UnitTest4
{ {
class ts_lawsuit
{
public Guid id { get; set; }
public Guid lawsuit_member_id { get; set; }
public Guid lawsuit_memberObligee_id { get; set; }
public ts_lawsuit_member ts_lawsuit_member { get; set; }
public ts_lawsuit_member ts_lawsuit_memberObligee { get; set; }
}
class ts_lawsuit_member
{
public Guid id { get; set; }
public string title { get; set; }
}
[Fact] [Fact]
public void VersionByte() public void VersionByte()
{ {
var ts_lawsuititem = new ts_lawsuit { id = Guid.NewGuid(), lawsuit_memberObligee_id = Guid.NewGuid(), lawsuit_member_id = Guid.NewGuid() };
g.mysql.Insert(new[]
{
new ts_lawsuit_member{id = ts_lawsuititem.lawsuit_member_id, title = "ts_lawsuit_member_title"},
new ts_lawsuit_member{id = ts_lawsuititem.lawsuit_memberObligee_id, title = "ts_lawsuit_memberObligee_title"}
}).ExecuteAffrows();
g.mysql.Insert(ts_lawsuititem).ExecuteAffrows();
var xxx = g.mysql.Select<ts_lawsuit>()
.LeftJoin(a => a.ts_lawsuit_member.id == a.lawsuit_member_id)
.LeftJoin(a => a.ts_lawsuit_memberObligee.id == a.lawsuit_memberObligee_id)
.First();
g.sqlserver.Insert(new AppSettingII g.sqlserver.Insert(new AppSettingII
{ {

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks> <TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>2.0.100</Version> <Version>2.0.101</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description> <Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>

View File

@ -524,19 +524,6 @@ namespace FreeSql.Internal
var isLazy = vp != null && vp.Item1 != null && !string.IsNullOrEmpty(trytbTypeLazyName); var isLazy = vp != null && vp.Item1 != null && !string.IsNullOrEmpty(trytbTypeLazyName);
AddTableRef(common, trytb, pnv, isLazy, vp, cscode); AddTableRef(common, trytb, pnv, isLazy, vp, cscode);
if (trytb.GetTableRef(pnv.Name, false) == null)
{
trytb.ColumnsByCsIgnore.Add(pnv.Name, new ColumnInfo
{
Table = trytb,
CsName = pnv.Name,
CsType = pnv.PropertyType,
Attribute = new ColumnAttribute
{
IsIgnore = true
}
});
}
} }
if (cscode?.Length > cscodeLength) if (cscode?.Length > cscodeLength)
{ {
@ -1620,8 +1607,12 @@ namespace FreeSql.Internal
continue; continue;
} }
ColumnInfo trycol = null; ColumnInfo trycol = null;
var readType = typetb?.ColumnsByCs.TryGetValue(prop.Name, out trycol) == true ? trycol.Attribute.MapType : prop.PropertyType; if (typetb != null && typetb.ColumnsByCs.TryGetValue(prop.Name, out trycol) == false)
{
++propIndex;
continue;
}
var readType = trycol?.Attribute.MapType ?? prop.PropertyType;
var ispkExp = new List<Expression>(); var ispkExp = new List<Expression>();
var propGetSetMethod = prop.GetSetMethod(true); var propGetSetMethod = prop.GetSetMethod(true);
Expression readVal = Expression.Assign(readpkvalExp, Expression.Call(MethodDataReaderGetValue, new Expression[] { commonUtilExp, rowExp, tryidxExp })); Expression readVal = Expression.Assign(readpkvalExp, Expression.Call(MethodDataReaderGetValue, new Expression[] { commonUtilExp, rowExp, tryidxExp }));

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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