修改代码

Author: linzhijun

csharp/ToolGood.Algorithm2/Internals/Hash.cs

@@ -103,8 +103,9 @@ public byte[] Finish()
 
         public static string GetMd5String(byte[] buffer)
         {
-            System.Security.Cryptography.MD5 md5 = new System.Security.Cryptography.MD5CryptoServiceProvider();
-            byte[] retVal = md5.ComputeHash(buffer);
+            System.Security.Cryptography.MD5 md5 = MD5.Create();
+
+			byte[] retVal = md5.ComputeHash(buffer);
             md5.Dispose();
             return BitConverter.ToString(retVal).Replace("-", "");
         }
@@ -113,8 +114,8 @@ public static string GetMd5String(byte[] buffer)
         #region SHA1
         public static string GetSha1String(byte[] buffer)
         {
-            SHA1 sha512 = new SHA1Managed();
-            byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
+            SHA1 sha512 = SHA1.Create();
+			byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
             sha512.Dispose();
             return BitConverter.ToString(retVal).Replace("-", "");
         }
@@ -125,8 +126,8 @@ public static string GetSha1String(byte[] buffer)
 
         public static string GetSha256String(byte[] buffer)
         {
-            SHA256 sha512 = new SHA256Managed();
-            byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
+            SHA256 sha512 = SHA256.Create();
+			byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
             sha512.Dispose();
             return BitConverter.ToString(retVal).Replace("-", "");
         }
@@ -136,8 +137,8 @@ public static string GetSha256String(byte[] buffer)
 
         public static string GetSha512String(byte[] buffer)
         {
-            SHA512 sha512 = new SHA512Managed();
-            byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
+            SHA512 sha512 = SHA512.Create();
+			byte[] retVal = sha512.ComputeHash(buffer); //计算指定Stream 对象的哈希值
             sha512.Dispose();
             return BitConverter.ToString(retVal).Replace("-", "");
         }

csharp/ToolGood.Algorithm2/Internals/MathVisitor.cs

@@ -1171,9 +1171,13 @@ public virtual Operand VisitMROUND_fun(mathParser.MROUND_funContext context)
         #region RAND
         public virtual Operand VisitRAND_fun(mathParser.RAND_funContext context)
         {
-            var tick = DateTime.Now.Ticks;
-            Random rand = new Random((int)(tick & 0xffffffffL) | (int)(tick >> 32));
-            return Operand.Create(rand.NextDouble());
+#if NETSTANDARD2_1
+			var tick = DateTime.Now.Ticks;
+			Random rand = new Random((int)(tick & 0xffffffffL) | (int)(tick >> 32));
+#else
+			Random rand=Random.Shared;
+#endif
+			return Operand.Create(rand.NextDouble());
         }
         public virtual Operand VisitRANDBETWEEN_fun(mathParser.RANDBETWEEN_funContext context)
         {
@@ -1183,9 +1187,13 @@ public virtual Operand VisitRANDBETWEEN_fun(mathParser.RANDBETWEEN_funContext co
             var firstValue = args[0];
             var secondValue = args[1];
 
-            var tick = DateTime.Now.Ticks;
-            Random rand = new Random((int)(tick & 0xffffffffL) | (int)(tick >> 32));
-            return Operand.Create(rand.NextDouble() * (secondValue.NumberValue - firstValue.NumberValue) + firstValue.NumberValue);
+#if NETSTANDARD2_1
+			var tick = DateTime.Now.Ticks;
+			Random rand = new Random((int)(tick & 0xffffffffL) | (int)(tick >> 32));
+#else
+			Random rand=Random.Shared;
+#endif
+			return Operand.Create(rand.NextDouble() * (secondValue.NumberValue - firstValue.NumberValue) + firstValue.NumberValue);
         }
         #endregion
 

csharp/ToolGood.Algorithm2/ToolGood.Algorithm2.csproj

@@ -6,7 +6,7 @@
     <Copyright>Copyright 2017-2022 ToolGood</Copyright>
     <AssemblyTitle>ToolGood.Algorithm</AssemblyTitle>
     <Authors>ToolGood</Authors>
-    <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <AssemblyName>ToolGood.Algorithm</AssemblyName>
     <PublicSign>true</PublicSign>
     <PackageId>ToolGood.Algorithm</PackageId>