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

v11.15.2024.0902

This commit is contained in:
大石头 2024-09-02 13:50:09 +08:00
parent 07acf99e39
commit c31c192c27
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XCode.MySql/XCode.MySql.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net452;net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyTitle>数据中间件MySql包</AssemblyTitle>
<Description>引入MySql数据库驱动包</Description>
<Company>新生命开发团队</Company>
@ -35,9 +35,12 @@
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='net452'">
<PackageReference Include="MySql.Data" Version="9.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<PackageReference Include="MySql.Data" Version="8.0.32.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\XCode\XCode.csproj" />
</ItemGroup>

2
XCode/Entity/EntityExtension.cs
View File

@ -1046,6 +1046,8 @@ public static class EntityExtension
/// <returns></returns>
public static IList<T> Merge<T, T2>(this IList<T> source, IEnumerable<T2> news, Func<T, T2, Boolean> predicate, Boolean trim = true) where T : class, IEntity where T2 : IModel
{
if (predicate == null) throw new ArgumentNullException(nameof(predicate));
var rs = new List<T>();
var fact = typeof(T).AsFactory();
foreach (var model in news)

2
XCode/XCode.csproj
View File

@ -44,7 +44,7 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="10.10.2024.803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
</ItemGroup>
<ItemGroup>
<Compile Remove="build\**" />

2
XUnitTest.XCode/XUnitTest.XCode.csproj
View File

@ -77,7 +77,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.803" />
<PackageReference Include="NewLife.Core" Version="10.10.2024.902" />
<PackageReference Include="NewLife.IP" Version="2.2.2024.810" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2024.102-beta0146" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />