From d4c766e0b666cea024a3640ca21be348f4d98924 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Thu, 26 Sep 2019 12:34:08 +0800 Subject: [PATCH] v0.10.3 #96 --- Examples/base_entity/base_entity.csproj | 3 +- .../FreeSql.Extensions.BaseEntity.csproj | 51 ++++++++------- .../FreeSql.Extensions.JsonMap.csproj | 55 +++++++++------- .../FreeSql.Extensions.JsonMap.xml | 19 ++++++ .../FreeSql.Extensions.LazyLoading.csproj | 58 +++++++++-------- FreeSql.DbContext/FreeSql.DbContext.csproj | 62 ++++++++++--------- FreeSql.Repository/FreeSql.Repository.csproj | 42 +++++++------ .../FreeSql.Tests/FreeSql.Tests.csproj | 1 + FreeSql.Tests/FreeSql.Tests/UnitTest1.cs | 1 - FreeSql/FreeSql.csproj | 8 ++- .../FreeSql.Provider.MySql.csproj | 8 ++- .../FreeSql.Provider.MySqlConnector.csproj | 8 ++- .../FreeSql.Provider.Odbc.csproj | 8 ++- .../FreeSql.Provider.Oracle.csproj | 8 ++- .../FreeSql.Provider.PostgreSQL.csproj | 8 ++- .../FreeSql.Provider.SqlServer.csproj | 9 ++- .../FreeSql.Provider.Sqlite.csproj | 8 ++- 17 files changed, 217 insertions(+), 140 deletions(-) create mode 100644 Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.xml diff --git a/Examples/base_entity/base_entity.csproj b/Examples/base_entity/base_entity.csproj index be75e076..2df960d9 100644 --- a/Examples/base_entity/base_entity.csproj +++ b/Examples/base_entity/base_entity.csproj @@ -6,7 +6,8 @@ - C:\Users\28810\Desktop\github\FreeSql\Examples\base_entity\base_entity.xml + base_entity.xml + 3 diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj index 5afa8208..2207db49 100644 --- a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj +++ b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj @@ -1,29 +1,34 @@  - - netstandard2.0 - 0.10.2 - true - YeXiangQin - BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用. - https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity - https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity - git - MIT - FreeSql;ORM;BaseEntity - $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true - $(AssemblyName) - true - true - + + netstandard2.0 + 0.10.3 + true + YeXiangQin + BaseEntity 是一种极简单的 CodeFirst 开发方式，特别对单表或多表CRUD，利用继承节省了每个实体类的重复属性（创建时间、ID等字段），软件删除等功能，进行 crud 操作时不必时常考虑仓储的使用. + https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity + https://github.com/2881099/FreeSql/tree/master/Extensions/FreeSql.Extensions.BaseEntity + git + MIT + FreeSql;ORM;BaseEntity + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - FreeSql.Extensions.BaseEntity.xml - + + + + + + FreeSql.Extensions.BaseEntity.xml + 3 + - - - + + + diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj index 37d84323..ab2405bd 100644 --- a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj +++ b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj @@ -1,29 +1,38 @@  - - netstandard2.0;net45 - 0.10.2 - true - YeXiangQin - FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储. - https://github.com/2881099/FreeSql - https://github.com/2881099/FreeSql - git - MIT - FreeSql;ORM - $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true - $(AssemblyName) - true - true - + + netstandard2.0;net45 + 0.10.3 + true + YeXiangQin + FreeSql 扩展包，可实现实体类属性为对象时，以JSON形式映射存储. + https://github.com/2881099/FreeSql + https://github.com/2881099/FreeSql + git + MIT + FreeSql;ORM + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - - + + + + + + FreeSql.Extensions.JsonMap.xml + 3 + - - - + + + + + + + diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.xml b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.xml new file mode 100644 index 00000000..6c47f3b3 --- /dev/null +++ b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.xml @@ -0,0 +1,19 @@ + + + + FreeSql.Extensions.JsonMap + + + + + 当实体类属性为【对象】时，以JSON形式映射存储 + + + + + 当实体类属性为【对象】时，并且标记特性 [JsonMap] 时，该属性将以JSON形式映射存储 + + + + + diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj index d08e658e..4dffe65c 100644 --- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj +++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj @@ -1,33 +1,37 @@  - - netstandard2.0;net45 - 0.10.2 - true - YeXiangQin - FreeSql 扩展包，可实现【延时加载】属性. - https://github.com/2881099/FreeSql - https://github.com/2881099/FreeSql - git - MIT - FreeSql;ORM - $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true - $(AssemblyName) - true - true - + + netstandard2.0;net45 + 0.10.3 + true + YeXiangQin + FreeSql 扩展包，可实现【延时加载】属性. + https://github.com/2881099/FreeSql + https://github.com/2881099/FreeSql + git + MIT + FreeSql;ORM + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - - + + + + + + + - - ns20;netstandard20 - - - - - + + ns20;netstandard20 + + + + + diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj index ce5df131..4fa928ad 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.csproj +++ b/FreeSql.DbContext/FreeSql.DbContext.csproj @@ -1,37 +1,41 @@  - - netstandard2.0;net45 - 0.10.2 - true - YeXiangQin - FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite. - https://github.com/2881099/FreeSql.DbContext - FreeSql ORM DbContext - git - MIT - $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true - $(AssemblyName) - true - true - + + netstandard2.0;net45 + 0.10.3 + true + YeXiangQin + FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite. + https://github.com/2881099/FreeSql.DbContext + FreeSql ORM DbContext + git + MIT + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - FreeSql.DbContext.xml - 3 - + + + + + + FreeSql.DbContext.xml + 3 + - - ns20;netstandard20 - + + ns20;netstandard20 + - - - + + + - - - + + + diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj index aad19d39..f0d1a112 100644 --- a/FreeSql.Repository/FreeSql.Repository.csproj +++ b/FreeSql.Repository/FreeSql.Repository.csproj @@ -1,24 +1,28 @@  - - netstandard2.0;net45 - 0.10.2 - YeXiangQin - FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite, and read/write separation、and split table. - https://github.com/2881099/FreeSql/wiki/Repository - FreeSql ORM Repository - true - git - MIT - $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true - $(AssemblyName) - true - true - + + netstandard2.0;net45 + 0.10.3 + YeXiangQin + FreeSql Implementation of General Repository, Support MySql/SqlServer/PostgreSQL/Oracle/Sqlite, and read/write separation、and split table. + https://github.com/2881099/FreeSql/wiki/Repository + FreeSql ORM Repository + true + git + MIT + $(AssemblyName) + logo.png + $(AssemblyName) + true + true + - - - + + + + + + + diff --git a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj index cee654fa..364e968d 100644 --- a/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj +++ b/FreeSql.Tests/FreeSql.Tests/FreeSql.Tests.csproj @@ -8,6 +8,7 @@ FreeSql.Tests.xml + 3 diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs index d13a42d1..8ea6aa71 100644 --- a/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs +++ b/FreeSql.Tests/FreeSql.Tests/UnitTest1.cs @@ -414,7 +414,6 @@ namespace FreeSql.Tests var testrunsql4 = g.oracle.Select().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo()).ToSql(); var testrunsql5 = g.sqlite.Select().Where(a => a.OptionsEntity04 > DateTime.Now.AddDays(0).ToString("yyyyMMdd").TryTo()).ToSql(); - var testssargs1 = "10100"; var testformatsql1 = g.mysql.Select().Where(a => a.NamespaceName == $"1_{10100}").ToSql(); var testorderbysql = g.mysql.Select().OrderByDescending(a => a.OptionsEntity04 + (a.score ?? 0)).ToSql(); diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index 23c3dbbd..c749d7f8 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, And Odbc. @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + FreeSql.xml 3 diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj index 06a562dd..0fc2a293 100644 --- a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj +++ b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj @@ -2,7 +2,7 @@ netstandard2.0;net452 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj index d8371404..e845faed 100644 --- a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj +++ b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + diff --git a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj index 3d93afa4..114a3e50 100644 --- a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj +++ b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库 Odbc 实现，基于 {Oracle}、{SQL Server}、{MySQL ODBC 8.0 Unicode Driver}、{PostgreSQL Unicode(x64)} 专用访问实现，以及通用 Odbc 访问所有数据库 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj index e5524557..95cba443 100644 --- a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj +++ b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 Oracle 11 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj index a8218328..a661cfd0 100644 --- a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj +++ b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 PostgreSQL 9.5 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj index 1c70b120..34830f99 100644 --- a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj +++ b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj @@ -2,7 +2,7 @@ netstandard2.0;net451 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next @@ -12,16 +12,19 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + + - diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj index 7ae15156..e211ad0e 100644 --- a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj +++ b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.10.2 + 0.10.3 true YeXiangQin FreeSql 数据库实现，基于 Sqlite 3.0 @@ -12,12 +12,16 @@ MIT FreeSql;ORM $(AssemblyName) - https://github.com/2881099/FreeSql/blob/master/logo.png?raw=true + logo.png $(AssemblyName) true true + + + +