This commit is contained in:
2881099 2023-03-31 19:38:09 +08:00
parent 4f921b4b0a
commit f9d6fcba4f
8 changed files with 8 additions and 1717 deletions

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net60</TargetFrameworks> <TargetFrameworks>net70;net60;netstandard2.0</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors> <Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql 数据库实现,基于 虚谷数据库 Ado.Net (XuguClient.dll)</Description> <Description>FreeSql 数据库实现,基于 虚谷数据库 Ado.Net (XuguClient.dll)</Description>
@ -24,7 +24,11 @@
<ItemGroup> <ItemGroup>
<None Include="../../logo.png" Pack="true" PackagePath="\" /> <None Include="../../logo.png" Pack="true" PackagePath="\" />
<None Include="lib\XuguClient.dll" Pack="true" PackagePath="\lib\net60\" /> <None Include="lib\XuguClient\netstandard2.0\XuguClient.dll" Pack="true" PackagePath="\lib\netstandard2.0\" />
<None Include="lib\XuguClient\net45\XuguClient.dll" Pack="true" PackagePath="\lib\net45\" />
<None Include="lib/**/*.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -33,7 +37,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="XuguClient"> <Reference Include="XuguClient">
<HintPath>lib\XuguClient.dll</HintPath> <HintPath>lib\core\XuguClient.dll</HintPath>
<Private>false</Private> <Private>false</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View File

@ -97,7 +97,7 @@ namespace FreeSql.Xugu
var tp = _orm.CodeFirst.GetDbInfo(type)?.type; var tp = _orm.CodeFirst.GetDbInfo(type)?.type;
if (col != null) if (col != null)
{ {
var dbtype = (XGDbType)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText }); var dbtype = (XGDbType?)_orm.DbFirst.GetDbType(new DatabaseModel.DbColumnInfo { DbTypeText = col.DbTypeText });
if (dbtype != null) if (dbtype != null)
{ {
if (col.DbPrecision != 0) ret.Precision = col.DbPrecision; if (col.DbPrecision != 0) ret.Precision = col.DbPrecision;

File diff suppressed because it is too large Load Diff