From 26115cfc9337c32a8d3eaf253336e2585874065a Mon Sep 17 00:00:00 2001 From: 2881099 <2881099@qq.com> Date: Wed, 15 Jun 2022 10:41:39 +0800 Subject: [PATCH] v3.2.666-preview20220615 --- Directory.Build.props | 2 +- FreeSql/FreeSql.xml | 8 ++++---- FreeSql/Properties/CoreStrings.Designer.cs | 17 ++++++++++------- FreeSql/Properties/CoreStrings.resx | 6 +++--- FreeSql/Properties/CoreStrings.zh-Hans.resx | 6 +++--- .../SqliteAdo/SqliteConnectionPool.cs | 4 ++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d553a425..ea5f1bee 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ - 3.2.666-preview20220614 + 3.2.666-preview20220615 diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml index 8e80f06e..fe98cb90 100644 --- a/FreeSql/FreeSql.xml +++ b/FreeSql/FreeSql.xml @@ -5291,12 +5291,12 @@ - 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64 + 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 - 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64 + 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 @@ -5326,7 +5326,7 @@ - -DB 参数错误，不支持的类型：\"{dbargs}\" + -DB 参数错误，不支持的类型："{dbargs}" @@ -5346,7 +5346,7 @@ - MygisGeometry.Parse 未实现 \"{wkt}\" + MygisGeometry.Parse 未实现 "{wkt}" diff --git a/FreeSql/Properties/CoreStrings.Designer.cs b/FreeSql/Properties/CoreStrings.Designer.cs index 35a02da9..0901b233 100644 --- a/FreeSql/Properties/CoreStrings.Designer.cs +++ b/FreeSql/Properties/CoreStrings.Designer.cs @@ -1,8 +1,11 @@  // -using System.Globalization; +using System; +using System.Reflection; using System.Resources; +using System.Globalization; +using System.Threading; namespace FreeSql { @@ -906,13 +909,13 @@ namespace FreeSql thisName); /// - /// 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64 + /// 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 /// - public static string S_ConnectionStringError_CheckProject - => GetString("S_ConnectionStringError_CheckProject "); + public static string S_ConnectionStringError_CheckProject + => GetString("S_ConnectionStringError_CheckProject"); /// - /// 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64 + /// 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 /// public static string S_ConnectionStringError_CheckProjectConnection(object thisName) => string.Format( @@ -952,7 +955,7 @@ namespace FreeSql => GetString("S_DB_ParameterError"); /// - /// -DB 参数错误，不支持的类型：\"{dbargs}\" + /// -DB 参数错误，不支持的类型："{dbargs}" /// public static string S_DB_ParameterError_UnsupportedType(object dbargs) => string.Format( @@ -980,7 +983,7 @@ namespace FreeSql => GetString("S_MasterDatabase"); /// - /// MygisGeometry.Parse 未实现 \"{wkt}\" + /// MygisGeometry.Parse 未实现 "{wkt}" /// public static string S_MygisGeometry_NotImplement(object wkt) => string.Format( diff --git a/FreeSql/Properties/CoreStrings.resx b/FreeSql/Properties/CoreStrings.resx index f36b4cca..558c6142 100644 --- a/FreeSql/Properties/CoreStrings.resx +++ b/FreeSql/Properties/CoreStrings.resx @@ -522,11 +522,11 @@ FreeSql:[{thisName}] Connection string error, please check. - - FreeSql:Connection string error, or check project properties > Build > Target Platform: x86 | x64 + + FreeSql:Connection string error, or check project properties > Build > Target Platform: x86 | x64, Or use FreeSql.Provider.SqliteCore accessing arm platform - FreeSql:[{thisName}] Connection string error, please check. Or check Project Properties > Build > Target Platform: x86 | x64 + FreeSql:[{thisName}] Connection string error, please check. Or check Project Properties > Build > Target Platform: x86 | x64, Or use FreeSql.Provider.SqliteCore accessing arm platform FreeSql:FreeSql.Provider.CustomAdapter cannot use CreateCommand diff --git a/FreeSql/Properties/CoreStrings.zh-Hans.resx b/FreeSql/Properties/CoreStrings.zh-Hans.resx index 2e70e730..48144c51 100644 --- a/FreeSql/Properties/CoreStrings.zh-Hans.resx +++ b/FreeSql/Properties/CoreStrings.zh-Hans.resx @@ -474,12 +474,12 @@ 【{thisName}】连接字符串错误，请检查。 Providers - - 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64 + + 连接字符串错误，或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 Providers - 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64 + 【{thisName}】连接字符串错误，请检查。或者检查项目属性 > 生成 > 目标平台：x86 | x64，或者改用 FreeSql.Provider.SqliteCore 访问 arm 平台 Providers diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs index 6fa2f9f7..71502e04 100644 --- a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs +++ b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs @@ -160,8 +160,8 @@ namespace FreeSql.Sqlite { if (obj.Value == null) { - _pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError), obj.LastGetTimeCopy); - throw new Exception(CoreStrings.S_ConnectionStringError_Check(this.Name)); + _pool.SetUnavailable(new Exception(CoreStrings.S_ConnectionStringError_CheckProject), obj.LastGetTimeCopy); + throw new Exception(CoreStrings.S_ConnectionStringError_CheckProjectConnection(this.Name)); } if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && obj.Value.Ping() == false)