NewLife
/
XCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
猿人易 2025-06-18 17:32:10 +08:00
parent bb17b7c160 2f1e163c6c
commit db26ff2ab5
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Test/Test.csproj
View File

@ -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" />

5
XCode/DataAccessLayer/Database/SQLite.cs
View File

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

21
XCode/Membership/字典参数.Biz.cs
View File

@ -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>

4
XCode/XCode.csproj
View File

@ -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" />

1
XUnitTest.XCode/DataAccessLayer/MySqlTests.cs
View File

@ -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();

4
XUnitTest.XCode/XUnitTest.XCode.csproj
View File

@ -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>