From 9bd399908248756af17b444e29a766f484cff43e Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Mon, 28 Apr 2025 21:33:22 +0800
Subject: [PATCH] v3.5.204-preview20250428 #2017 #1982 #2015 #1952 #1674 #1520
---
Directory.Build.props | 2 +-
.../FreeSql.Extensions.AggregateRoot.csproj | 2 +-
.../FreeSql.Extensions.BaseEntity.csproj | 2 +-
.../EFModelExtensions.cs | 2 +-
.../FreeSql.Extensions.EFModel.csproj | 4 +-
.../FreeSql.Extensions.JsonMap.csproj | 2 +-
.../FreeSql.Extensions.LazyLoading.csproj | 2 +-
.../FreeSql.Extensions.Linq.csproj | 2 +-
.../FreeSql.Extensions.ZeroEntity.csproj | 2 +-
.../FreeSql.Generator.csproj | 2 +-
FreeSql.All/FreeSql.All.csproj | 2 +-
FreeSql.DbContext/FreeSql.DbContext.csproj | 2 +-
FreeSql.DbContext/FreeSql.DbContext.xml | 17 ---
FreeSql.Repository/FreeSql.Repository.csproj | 2 +-
.../Sqlite/Curd/SqliteInsertTest.cs | 4 +-
.../FreeSql.Tests/FreeSql.Tests.csproj | 1 -
FreeSql.sln | 19 ++-
FreeSql/FreeSql.csproj | 2 +-
FreeSql/FreeSql.xml | 109 ++++++++++++++++++
.../FreeSql.Provider.ClickHouse.csproj | 2 +-
.../FreeSql.Provider.Custom.csproj | 2 +-
.../FreeSql.Provider.Dameng.csproj | 2 +-
.../FreeSql.Provider.Duckdb.csproj | 2 +-
.../FreeSql.Provider.Firebird.csproj | 2 +-
.../FreeSql.Provider.GBase.csproj | 2 +-
.../FreeSql.Provider.KingbaseES.csproj | 2 +-
.../FreeSql.Provider.MsAccess.csproj | 2 +-
.../FreeSql.Provider.MySql.csproj | 2 +-
.../FreeSql.Provider.MySqlConnector.csproj | 2 +-
.../FreeSql.Provider.Odbc.csproj | 2 +-
.../FreeSql.Provider.Oracle.csproj | 2 +-
.../FreeSql.Provider.OracleOledb.csproj | 2 +-
.../FreeSql.Provider.PostgreSQL.csproj | 2 +-
.../FreeSql.Provider.QuestDb.csproj | 2 +-
.../FreeSql.Provider.ShenTong.csproj | 2 +-
.../FreeSql.Provider.SqlServer.csproj | 2 +-
...FreeSql.Provider.SqlServerForSystem.csproj | 2 +-
.../FreeSql.Provider.Sqlite.csproj | 2 +-
.../FreeSql.Provider.SqliteCore.csproj | 2 +-
.../FreeSql.Provider.TDengine.csproj | 2 +-
.../FreeSql.Provider.Xugu.csproj | 2 +-
41 files changed, 165 insertions(+), 59 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 940f40837..dd35d730e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -12,7 +12,7 @@
diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
index 0c41ff09b..895cb4427 100644
--- a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
+++ b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
@@ -18,7 +18,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
index 7c7d205ff..5a678bc3e 100644
--- a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
+++ b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
@@ -19,7 +19,7 @@
key.snk
false
latest
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.EFModel/EFModelExtensions.cs b/Extensions/FreeSql.Extensions.EFModel/EFModelExtensions.cs
index e56d1c2d5..f75283e99 100644
--- a/Extensions/FreeSql.Extensions.EFModel/EFModelExtensions.cs
+++ b/Extensions/FreeSql.Extensions.EFModel/EFModelExtensions.cs
@@ -16,7 +16,7 @@ using DbContext = Microsoft.EntityFrameworkCore.DbContext;
public static partial class EFModelExtensions
{
///
- /// 根据 EFCore DbContext ModelBuilder 配置 FreeSql 实体特性
+ /// EFCore ModelBuilder 与 FreeSql 打通实体特性配置（实现室）
///
///
///
diff --git a/Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj b/Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj
index fbdc0ba27..a1adc773e 100644
--- a/Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj
+++ b/Extensions/FreeSql.Extensions.EFModel/FreeSql.Extensions.EFModel.csproj
@@ -4,7 +4,7 @@
net9.0;net8.0;net7.0;net6.0;
true
FreeSql;ncc;YeXiangQin
- FreeSql 扩展包，聚合根（实现室）.
+ FreeSql 扩展包，EFCore ModelBuilder 与 FreeSql 打通实体特性配置（实现室）.
https://github.com/dotnetcore/FreeSql/wiki/%E8%81%9A%E5%90%88%E6%A0%B9%EF%BC%88%E5%AE%9E%E9%AA%8C%E5%AE%A4%EF%BC%89
https://github.com/dotnetcore/FreeSql/wiki/%E8%81%9A%E5%90%88%E6%A0%B9%EF%BC%88%E5%AE%9E%E9%AA%8C%E5%AE%A4%EF%BC%89
git
@@ -18,7 +18,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
index 341d1af90..81877ac49 100644
--- a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
+++ b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
@@ -18,7 +18,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
index 26f21eb03..b42382abd 100644
--- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
+++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
@@ -15,7 +15,7 @@
$(AssemblyName)
true
true
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
index a0b5b3843..3c513d238 100644
--- a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
+++ b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
@@ -18,7 +18,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj b/Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj
index af2bd205c..d0b254970 100644
--- a/Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj
+++ b/Extensions/FreeSql.Extensions.ZeroEntity/FreeSql.Extensions.ZeroEntity.csproj
@@ -18,7 +18,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
index 8af60d8ec..b2e978e72 100644
--- a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
+++ b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -13,7 +13,7 @@
https://github.com/2881099/FreeSql
https://github.com/2881099/FreeSql
FreeSql DbFirst 实体生成器
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/FreeSql.All/FreeSql.All.csproj b/FreeSql.All/FreeSql.All.csproj
index 60e5ff8c3..e64a6a218 100644
--- a/FreeSql.All/FreeSql.All.csproj
+++ b/FreeSql.All/FreeSql.All.csproj
@@ -17,7 +17,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj
index ae4ea144f..da2096f88 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.csproj
+++ b/FreeSql.DbContext/FreeSql.DbContext.csproj
@@ -17,7 +17,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 7cc8aea60..8e4fe1bc3 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -718,15 +718,6 @@
-
-
- 根据Assembly扫描所有继承IEntityTypeConfiguration<T>的配置类
-
-
-
-
-
-
创建普通数据上下文档对象
@@ -764,13 +755,5 @@
-
-
- 批量注入 Repository，可以参考代码自行调整
-
-
-
-
-
diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj
index fd6514ac9..337726900 100644
--- a/FreeSql.Repository/FreeSql.Repository.csproj
+++ b/FreeSql.Repository/FreeSql.Repository.csproj
@@ -17,7 +17,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs
index 39869d914..281f61e5b 100644
--- a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteInsertTest.cs
@@ -148,13 +148,13 @@ namespace FreeSql.Tests.Sqlite
{
list.Add(new Topic { Id = i, Clicks = i * 2, Title = "BULK" + i.ToString(), CreateTime = DateTime.Now });
}
- insert.AppendData(list).BulkInsert();
+ insert.AppendData(list).ExecuteSqliteBulkInsert();
Assert.Equal(10, g.sqlite.Select().Where(m => m.Title.StartsWith("BULK")).Count());
g.sqlite.Delete().Where(m => true).ExecuteAffrows();
g.sqlite.Transaction(() =>
{
- g.sqlite.Insert(list).BulkInsert();
+ g.sqlite.Insert(list).ExecuteSqliteBulkInsert();
Assert.Equal(10, g.sqlite.Select().Where(m => m.Title.StartsWith("BULK")).Count());
});
}
diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
index c6f3aacf3..966284d11 100644
--- a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
+++ b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj
@@ -18,7 +18,6 @@
-
diff --git a/FreeSql.sln b/FreeSql.sln
index ee33927be..0d10f100e 100644
--- a/FreeSql.sln
+++ b/FreeSql.sln
@@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.TDengine",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.Provider.TDengine", "FreeSql.Tests\FreeSql.Tests.Provider.TDengine\FreeSql.Tests.Provider.TDengine.csproj", "{0C178F1C-0F65-47AA-A1DE-545CBF8543D1}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.EFModel", "Extensions\FreeSql.Extensions.EFModel\FreeSql.Extensions.EFModel.csproj", "{4281AC48-6FE7-49C3-BE7B-D029058646BC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -817,6 +819,18 @@ Global
{0C178F1C-0F65-47AA-A1DE-545CBF8543D1}.Release|x64.Build.0 = Release|Any CPU
{0C178F1C-0F65-47AA-A1DE-545CBF8543D1}.Release|x86.ActiveCfg = Release|Any CPU
{0C178F1C-0F65-47AA-A1DE-545CBF8543D1}.Release|x86.Build.0 = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|x64.Build.0 = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Debug|x86.Build.0 = Debug|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x64.ActiveCfg = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x64.Build.0 = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.ActiveCfg = Release|Any CPU
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -860,10 +874,11 @@ Global
{D9419896-BFB0-47C1-BEFD-A6C48394643B} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
{4871434E-481D-4306-B6DD-73595C61A473} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
{329BA8B3-4139-4CCE-AFEC-4BE9B7BED317} = {2A381C57-2697-427B-9F10-55DA11FD02E4}
+ {4281AC48-6FE7-49C3-BE7B-D029058646BC} = {4A92E8A6-9A6D-41A1-9CDA-DE10899648AA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- RESX_NeutralResourcesLanguage = en-US
- RESX_PrefixTranslations = True
SolutionGuid = {089687FD-5D25-40AB-BA8A-A10D1E137F98}
+ RESX_PrefixTranslations = True
+ RESX_NeutralResourcesLanguage = en-US
EndGlobalSection
EndGlobal
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
index 5201c5563..f6753a9e8 100644
--- a/FreeSql/FreeSql.csproj
+++ b/FreeSql/FreeSql.csproj
@@ -17,7 +17,7 @@
true
key.snk
false
- 3.5.204-preview20250425
+ 3.5.204-preview20250428
readme.md