懒得勤快 1 yıl önce
ebeveyn
işleme
31df03630b

+ 14 - 0
Masuit.Tools.Abstractions/Extensions/BaseType/ObjectExtensions.cs

@@ -7,10 +7,15 @@ using System.Reflection;
 using Masuit.Tools.Dynamics;
 using Masuit.Tools.Reflection;
 using Newtonsoft.Json.Linq;
+
+#if NETSTANDARD2_1_OR_GREATER
+
 using System.Text.Json;
 using Masuit.Tools.Systems;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
+#endif
+
 namespace Masuit.Tools;
 
 /// <summary>
@@ -128,6 +133,7 @@ public static class ObjectExtensions
         return useJson ? InternalJsonCopy(original) : (T)InternalCopy(original, new Dictionary<object, object>(new ReferenceEqualityComparer()));
     }
 
+#if NETSTANDARD2_1_OR_GREATER
     private static T InternalJsonCopy<T>(T obj)
     {
         using var stream = new PooledMemoryStream();
@@ -137,6 +143,14 @@ public static class ObjectExtensions
         var reader = new Utf8JsonReader(stream.ToArray());
         return JsonSerializer.Deserialize<T>(ref reader);
     }
+#else
+
+    private static T InternalJsonCopy<T>(T obj)
+    {
+        return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(obj));
+    }
+
+#endif
 
     private static object InternalCopy(object originalObject, IDictionary<object, object> visited)
     {

+ 1 - 1
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj

@@ -3,7 +3,7 @@
         <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net5;net6;net7;net8</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.6.8.4</Version>
+        <Version>2.6.8.6</Version>
         <Authors>懒得勤快</Authors>
         <Description>全龄段友好的C#万能工具库,码数吐司库,不管你是菜鸟新手还是骨灰级玩家都能轻松上手,Masuit.Tools基础公共库(适用于.NET4.6.1/.NET Standard2.0及以上项目),包含一些常用的操作类,大都是静态类,加密解密,反射操作,Excel简单导出,权重随机筛选算法,分布式短id,表达式树,linq扩展,文件压缩,多线程下载和FTP客户端,硬件信息,字符串扩展方法,日期时间扩展操作,中国农历,大文件拷贝,图像裁剪,验证码,断点续传,集合扩展等常用封装。
             官网教程:https://tools.masuit.org

+ 1 - 1
Masuit.Tools.Abstractions/Win32/Windows.cs

@@ -273,7 +273,7 @@ public class WindowsServer
             //获取硬盘ID
             using var mc = new ManagementClass("Win32_DiskDrive");
             using var moc = mc.GetInstances();
-            foreach (ManagementObject o in moc)
+            foreach (var o in moc)
             {
                 using (o)
                 {

+ 1 - 1
Masuit.Tools.AspNetCore/Masuit.Tools.AspNetCore.csproj

@@ -18,7 +18,7 @@
         <Product>Masuit.Tools.AspNetCore</Product>
         <PackageId>Masuit.Tools.AspNetCore</PackageId>
         <LangVersion>latest</LangVersion>
-        <Version>1.2.8.5</Version>
+        <Version>1.2.8.6</Version>
         <RepositoryType></RepositoryType>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <FileVersion>1.1.9</FileVersion>

+ 1 - 1
Masuit.Tools.Core/Masuit.Tools.Core.csproj

@@ -6,7 +6,7 @@
 官网教程:https://tools.masuit.org
 github:https://github.com/ldqk/Masuit.Tools
         </Description>
-        <Version>2.6.8.5</Version>
+        <Version>2.6.8.6</Version>
         <Copyright>Copyright © 懒得勤快</Copyright>
         <PackageProjectUrl>https://github.com/ldqk/Masuit.Tools</PackageProjectUrl>
         <PackageTags>Masuit.Tools,工具库,Utility,Crypt,Extensions</PackageTags>

+ 3 - 0
Masuit.Tools/Masuit.Tools.csproj

@@ -222,6 +222,9 @@
     <PackageReference Include="StackExchange.Redis">
       <Version>2.7.10</Version>
     </PackageReference>
+    <PackageReference Include="System.Text.Json">
+      <Version>8.0.0</Version>
+    </PackageReference>
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>