From 040e356f43e74af6dc29ad85449078242d65968d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?=
 <nnhy@vip.qq.com>
Date: Sun, 1 Jun 2025 16:09:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?v11.19.2025.0601=20=E6=94=AF=E6=8C=812024?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/Test.csproj                              | 6 +++---
 XCode/XCode.csproj                            | 4 ++--
 XUnitTest.XCode/DataAccessLayer/MySqlTests.cs | 1 +
 XUnitTest.XCode/XUnitTest.XCode.csproj        | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

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 @@
   <ItemGroup>
     <PackageReference Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
     <PackageReference Include="MySql.Data" Version="9.1.0" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.411" />
-    <PackageReference Include="NewLife.Remoting" Version="3.3.2025.401" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.401" />
+    <PackageReference Include="NewLife.Redis" Version="6.2.2025.503" />
+    <PackageReference Include="NewLife.Remoting" Version="3.3.2025.501" />
+    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.506" />
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.7.0" />
     <PackageReference Include="SapHana.DotNetCore.Data.Provider" Version="2.11.14" />
     <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
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 @@
     <RepositoryUrl>https://github.com/NewLifeX/X</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>新生命团队;X组件;NewLife;$(AssemblyName)</PackageTags>
-    <PackageReleaseNotes>支持循环天表的自动分表；优化对SqlServer的支持</PackageReleaseNotes>
+    <PackageReleaseNotes>支持2024行政区划</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -46,7 +46,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.501" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="NewLife" />
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 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.501" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
     <PackageReference Include="NewLife.IP" Version="2.3.2025.202" />
     <PackageReference Include="NewLife.UnitTest" Version="1.0.2025.101" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From dfce86e800b71b594702e10d1c6d210c1dff54b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?=
 <nnhy@vip.qq.com>
Date: Thu, 12 Jun 2025 11:22:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XCode/Membership/字典参数.Biz.cs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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<Parameter>
     #region 业务操作
     /// <summary>根据种类返回数据</summary>
     /// <returns></returns>
-    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<Parameter>
     /// <returns></returns>
     public T[] GetList<T>()
     {
-        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<T>()).ToArray();
+        var arr = Value.Split(",", ";", "，");
+        return arr.Select(e => e.ChangeType<T>()!).ToArray();
     }
 
     /// <summary>获取名值对</summary>
@@ -253,11 +252,11 @@ public partial class Parameter : Entity<Parameter>
     /// <returns></returns>
     public IDictionary<TKey, TValue> GetHash<TKey, TValue>()
     {
-        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<TKey>(), e => e.Value.ChangeType<TValue>());
+        return dic.ToDictionary(e => e.Key.ChangeType<TKey>()!, e => e.Value.ChangeType<TValue>()!);
     }
 
     /// <summary>设置列表</summary>

From 7a7c914ca9194c03d7c314b750a24e3981891210 Mon Sep 17 00:00:00 2001
From: top5five <top5five@163.com>
Date: Mon, 16 Jun 2025 15:53:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?Microsoft.Data.Sqlite.Core=2010.0.0=20?=
 =?UTF-8?q?=E4=BB=A5=E4=B8=8A=E7=9A=84=E7=89=88=E6=9C=AC=E5=B0=B1=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=9C=A8=20Xamarin.Android=20?=
 =?UTF-8?q?=E4=B8=8A=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 XCode/DataAccessLayer/Database/SQLite.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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) ??