From 0a206b588f7658318f65eed1f871662331905b52 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Tue, 2 Jul 2019 14:56:40 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=EF=BC=8C=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=B1=9E=E4=BA=8E=20.exe?= =?UTF-8?q?=20=E7=A8=8B=E5=BA=8F=E9=9B=86=E6=97=B6=E7=9A=84=20bug=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FreeSql.Extensions.LazyLoading.csproj | 2 +- FreeSql.DbContext/FreeSql.DbContext.csproj | 2 +- FreeSql.Repository/FreeSql.Repository.csproj | 2 +- FreeSql.Tests/FreeSql.Tests/ftTests.xml | 198 ------------------ FreeSql/FreeSql.csproj | 2 +- FreeSql/Internal/CommonUtils.cs | 12 +- .../FreeSql.Provider.MySql.csproj | 2 +- .../FreeSql.Provider.MySqlConnector.csproj | 2 +- .../FreeSql.Provider.Oracle.csproj | 2 +- .../FreeSql.Provider.PostgreSQL.csproj | 2 +- .../FreeSql.Provider.SqlServer.csproj | 2 +- .../FreeSql.Provider.Sqlite.csproj | 2 +- 12 files changed, 20 insertions(+), 210 deletions(-) delete mode 100644 FreeSql.Tests/FreeSql.Tests/ftTests.xml diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj index 4d94d32d..5a063f1e 100644 --- a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj +++ b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.7.1 + 0.7.2 true YeXiangQin FreeSql 扩展包，可实现【延时加载】属性. diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj index 3371ed37..66031d34 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.csproj +++ b/FreeSql.DbContext/FreeSql.DbContext.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.7.1 + 0.7.2 true YeXiangQin FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite. diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj index a0b504d7..51d9d711 100644 --- a/FreeSql.Repository/FreeSql.Repository.csproj +++ b/FreeSql.Repository/FreeSql.Repository.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.7.1 + 0.7.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 diff --git a/FreeSql.Tests/FreeSql.Tests/ftTests.xml b/FreeSql.Tests/FreeSql.Tests/ftTests.xml deleted file mode 100644 index 55568931..00000000 --- a/FreeSql.Tests/FreeSql.Tests/ftTests.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - FreeSql.Tests - - - - - 保存或添加，如果主键有值则尝试 Update，如果影响的行为 0 则尝试 Insert - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 类型 - - - - - 内容简介 - - - - - 缩略图 - - - - - 点击量 - - - - - - - - - - - - - - - - - - - - - - - - - 主键，ID - - - - - 试卷表 - - - - - 考核计划ID - - - - - 总分 - - - - - 菜单权限ID - - - - - 菜单主键ID - - - - - 按钮主键ID - - - - - 菜单权限 - - - - - 主键 - - - - - 父级ID - - - - - 名称 - - - - - 图标 - - - - - 链接地址 - - - - - 是否公开 - - - - - 排序 - - - - - 备注 - - - - - 创建日期 - - - - - 按钮主键 - - - - - 名称 - - - - - 事件名称 - - - - - 编码 - - - - - 图标 - - - - - 排序 - - - - - 创建日期 - - - - diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj index 657f4034..995764ae 100644 --- a/FreeSql/FreeSql.csproj +++ b/FreeSql/FreeSql.csproj @@ -2,7 +2,7 @@ netstandard2.0;net45 - 0.7.1 + 0.7.2 true YeXiangQin FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite. diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs index 132ce338..d3ab7304 100644 --- a/FreeSql/Internal/CommonUtils.cs +++ b/FreeSql/Internal/CommonUtils.cs @@ -282,7 +282,7 @@ namespace FreeSql.Internal /// Dict：key=属性名，value=注释 public static Dictionary GetProperyCommentBySummary(Type type) { - var xmlPath = type.Assembly.Location.Replace(".dll", ".xml"); + var xmlPath = type.Assembly.Location.Replace(".dll", ".xml").Replace(".exe", ".xml"); if (File.Exists(xmlPath) == false) return null; var dic = new Dictionary(); @@ -290,7 +290,15 @@ namespace FreeSql.Internal var sReader = new StringReader(File.ReadAllText(xmlPath)); using (var xmlReader = XmlReader.Create(sReader)) { - var xpath = new XPathDocument(xmlReader); + XPathDocument xpath = null; + try + { + xpath = new XPathDocument(xmlReader); + } + catch + { + return null; + } var xmlNav = xpath.CreateNavigator(); var props = type.GetProperties(); diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj index dc32780a..4a2bb3f0 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj index 86e4ba0f..ffc58266 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 MySql 5.6 diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj index a2fbdd88..f2db0b01 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 Oracle 11 diff --git a/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj b/Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj index efd7c307..d24c5e15 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 PostgreSQL 9.5 diff --git a/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj b/Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj index 0cc24814..1b30b0c3 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 SqlServer 2005+，并根据版本适配分页方法：row_number 或 offset fetch next diff --git a/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj b/Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj index a3423442..988d58c5 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.7.1 + 0.7.2 true YeXiangQin FreeSql 数据库实现，基于 Sqlite 3.0