v11.15.2024.0902

NewLifeX · Sep 2, 2024 · c31c192 · c31c192
1 parent 07acf99
commit c31c192
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/XCode.MySql/XCode.MySql.csproj b/XCode.MySql/XCode.MySql.csproj
@@ -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>

diff --git a/XCode/Entity/EntityExtension.cs b/XCode/Entity/EntityExtension.cs
@@ -1046,6 +1046,8 @@ public static Int32 Upsert(this IEntity entity, BatchOption? option = null, IEnt
     /// <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)

diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
@@ -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\**" />

diff --git a/XUnitTest.XCode/XUnitTest.XCode.csproj b/XUnitTest.XCode/XUnitTest.XCode.csproj
@@ -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" />