diff --git a/Test/Test.csproj b/Test/Test.csproj
index ee45335ed..166c3ebe7 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -38,9 +38,9 @@
-
-
-
+
+
+
diff --git a/XCode/DataAccessLayer/Database/SQLite.cs b/XCode/DataAccessLayer/Database/SQLite.cs
index 655b7d895..b5a0d3c3b 100755
--- a/XCode/DataAccessLayer/Database/SQLite.cs
+++ b/XCode/DataAccessLayer/Database/SQLite.cs
@@ -23,8 +23,9 @@ internal class SQLite : FileDbBase
protected override DbProviderFactory? CreateFactory()
{
// Mono有自己的驱动，因为SQLite是混合编译，里面的C++代码与平台相关，不能通用;注意大小写问题
- if (Runtime.Mono)
- return GetProviderFactory(null, "Mono.Data.Sqlite.dll", "System.Data.SqliteFactory")!;
+ //Microsoft.Data.Sqlite.Core 10.0.0 以上的版本就可以支持在 Xamarin.Android 上运行
+ //if (Runtime.Mono)
+ // return GetProviderFactory(null, "Mono.Data.Sqlite.dll", "System.Data.SqliteFactory")!;
var type =
PluginHelper.LoadPlugin("System.Data.SQLite.SQLiteFactory", null, "System.Data.SQLite.dll", null) ??
diff --git a/XCode/Membership/字典参数.Biz.cs b/XCode/Membership/字典参数.Biz.cs
index df03cfb14..6646cf21a 100644
--- a/XCode/Membership/字典参数.Biz.cs
+++ b/XCode/Membership/字典参数.Biz.cs
@@ -1,5 +1,4 @@
using System.Collections;
-using NewLife;
using NewLife.Collections;
using NewLife.Data;
using NewLife.Reflection;
@@ -124,10 +123,10 @@ public partial class Parameter : Entity
#region 业务操作
/// 根据种类返回数据
///
- public Object GetValue()
+ public Object? GetValue()
{
- var str = Value;
- if (str.IsNullOrEmpty()) str = LongValue;
+ var str = Value?.Trim();
+ if (str.IsNullOrEmpty()) str = LongValue?.Trim();
if (str.IsNullOrEmpty()) return null;
switch (Kind)
@@ -240,11 +239,11 @@ public partial class Parameter : Entity
///
public T[] GetList()
{
- var str = Value;
- if (str.IsNullOrEmpty()) str = LongValue;
+ var str = Value?.Trim();
+ if (str.IsNullOrEmpty()) str = LongValue?.Trim();
- var arr = Value.Split(",", ";");
- return arr.Select(e => e.ChangeType()).ToArray();
+ var arr = Value.Split(",", ";", "，");
+ return arr.Select(e => e.ChangeType()!).ToArray();
}
/// 获取名值对
@@ -253,11 +252,11 @@ public partial class Parameter : Entity
///
public IDictionary GetHash()
{
- var str = Value;
- if (str.IsNullOrEmpty()) str = LongValue;
+ var str = Value?.Trim();
+ if (str.IsNullOrEmpty()) str = LongValue?.Trim();
var dic = Value.SplitAsDictionary("=", ",");
- return dic.ToDictionary(e => e.Key.ChangeType(), e => e.Value.ChangeType());
+ return dic.ToDictionary(e => e.Key.ChangeType()!, e => e.Value.ChangeType()!);
}
/// 设置列表
diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
index cd0f153fb..2a7466999 100644
--- a/XCode/XCode.csproj
+++ b/XCode/XCode.csproj
@@ -31,7 +31,7 @@
https://github.com/NewLifeX/X
git
新生命团队;X组件;NewLife;$(AssemblyName)
- 支持循环天表的自动分表；优化对SqlServer的支持
+ 支持2024行政区划
MIT
true
true
@@ -46,7 +46,7 @@
-
+
diff --git a/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs b/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
index 0a1af88b8..8f085fb22 100644
--- a/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
+++ b/XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
@@ -161,6 +161,7 @@ public class MySqlTests
User.Meta.ConnName = "MySql_member";
Role.Meta.ConnName = "MySql_member";
+ Role.Meta.Session.Truncate();
User.Meta.Session.InitData();
Role.Meta.Session.InitData();
diff --git a/XUnitTest.XCode/XUnitTest.XCode.csproj b/XUnitTest.XCode/XUnitTest.XCode.csproj
index 20e46577c..36cb26d6c 100644
--- a/XUnitTest.XCode/XUnitTest.XCode.csproj
+++ b/XUnitTest.XCode/XUnitTest.XCode.csproj
@@ -85,12 +85,12 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive