From 65efd6471bf1d312e26e0cb7e24e14788ba0388e Mon Sep 17 00:00:00 2001 From: luoyunchong Date: Wed, 29 Dec 2021 19:03:45 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E5=BC=95=E7=94=A8=E5=8C=85=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeSql.Tests.Provider.GBase.csproj | 6 ------ .../GBase/Curd/GBaseDeleteTest.cs | 1 - FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs | 3 +-- .../FreeSql.Tests.Provider.Sqlite.Data.csproj | 2 ++ .../FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs | 1 - FreeSql/FreeSqlBuilder.cs | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj index 6abc2f4f..a335a9cf 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj +++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/FreeSql.Tests.Provider.GBase.csproj @@ -29,10 +29,4 @@ - - - - d:\testcode\GeneralData.EntityFrameworkCore.GBase.DataProvider.dll - - diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs index 5fa2bf09..402df561 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/GBase/Curd/GBaseDeleteTest.cs @@ -1,5 +1,4 @@ using FreeSql.DataAnnotations; -using IBM.Data.Informix; using System; using System.Collections.Generic; using System.Linq; diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs index 90ea40d4..8fcee4a4 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.GBase/g.cs @@ -1,5 +1,4 @@ -using IBM.Data.Informix; -using System; +using System; using System.Collections.Generic; using System.Data.Odbc; using System.Diagnostics; diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj index d21d4ff3..93061340 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj +++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/FreeSql.Tests.Provider.Sqlite.Data.csproj @@ -9,6 +9,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -24,6 +25,7 @@ + diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs index 3759f1bb..748bdf63 100644 --- a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs +++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/UnitTest1.cs @@ -3,7 +3,6 @@ using Microsoft.Data.Sqlite; using System; using System.Collections.Generic; using System.IO; -using System.Security.Principal; using Xunit; [Table(Name = "TestTypeInfoT1")] diff --git a/FreeSql/FreeSqlBuilder.cs b/FreeSql/FreeSqlBuilder.cs index f0b40d7c..04dd8934 100644 --- a/FreeSql/FreeSqlBuilder.cs +++ b/FreeSql/FreeSqlBuilder.cs @@ -201,7 +201,7 @@ namespace FreeSql break; case DataType.Sqlite: type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.Sqlite")?.MakeGenericType(typeof(TMark)); - if (type == null) type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.Sqlite.Data.Core")?.MakeGenericType(typeof(TMark)); //FreeSql.Provider.Sqlite.Data.dll + if (type == null) type = Type.GetType("FreeSql.Sqlite.SqliteProvider`1,FreeSql.Provider.SqliteCore")?.MakeGenericType(typeof(TMark)); //Microsoft.Data.Sqlite.Core.dll if (type == null) throwNotFind("FreeSql.Provider.Sqlite.dll", "FreeSql.Sqlite.SqliteProvider<>"); break;