修改版本逻辑校验错误的问题

Author: JiuLing-zhang

src/JiuLing.CommonLibs.UnitTests/VersionUtilsTests.cs

@@ -32,7 +32,7 @@ public void CheckNeedUpdate2Test(string currentVersion, string newVersion, bool
         }
 
         [TestMethod()]
-        [DataRow("1.0.0", "1.0.2", "1.0.0", false, true)]
+        [DataRow("1.0.0", "1.0.2", "1.0.0", true, true)]
         [DataRow("1.0.0", "1.0.2", "1.0.1", true, false)]
         [DataRow("1.0.0", "1.0.0", "1.0.0", false, true)]
         public void CheckNeedUpdate3Test(string currentVersion, string newVersion, string minVersion, bool isNeedUpdate, bool isAllowUse)
@@ -45,11 +45,11 @@ public void CheckNeedUpdate3Test(string currentVersion, string newVersion, strin
         }
 
         [TestMethod()]
-        [DataRow("1.0.0", "1.0.2", "1.0.0", false, true)]
+        [DataRow("1.0.0", "1.0.2", "1.0.0", true, true)]
         [DataRow("1.0.0", "1.0.2", "1.0.1", true, false)]
         [DataRow("1.0.0", "1.0.0", "1.0.0", false, true)]
         [DataRow("1.0.0", "1.0.0.0", "1.0.0", false, true)]
-        [DataRow("1.1.0", "1.2.0.0", "1.1.0.0", false, true)]
+        [DataRow("1.1.0", "1.2.0.0", "1.1.0.0", true, true)]
         [DataRow("1.0.0", "1.2.0.0", "1.1.0.0", true, false)]
         public void CheckNeedUpdate4Test(string currentVersion, string newVersion, string minVersion, bool isNeedUpdate, bool isAllowUse)
         {

src/JiuLing.CommonLibs/JiuLing.CommonLibs.csproj

@@ -7,7 +7,7 @@
 		<PackageProjectUrl>https://github.com/JiuLing-zhang/JiuLing.CommonLibs</PackageProjectUrl>
 		<PackageIcon>nuget_icon.png</PackageIcon>
 		<PackageIconUrl />
-		<Version>1.6.5</Version>
+		<Version>1.6.6</Version>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Copyright>Copyright (c) 2021 九零</Copyright>

src/JiuLing.CommonLibs/VersionUtils.cs

@@ -74,17 +74,20 @@ public static (bool IsNeedUpdate, bool IsAllowUse) CheckNeedUpdate(string curren
         /// <returns>返回（是否需要自动更新，当前版本是否允许使用）</returns>
         public static (bool IsNeedUpdate, bool IsAllowUse) CheckNeedUpdate(Version currentVersion, Version newVersion, Version minVersion)
         {
-            if (!CheckNeedUpdate(currentVersion, newVersion))
+            bool isNeedUpdate = CheckNeedUpdate(currentVersion, newVersion);
+            int result = currentVersion.CompareTo(minVersion);
+            if (result < 0)
             {
-                return (false, true);
+                return (isNeedUpdate, false);
             }
-
-            if (currentVersion.CompareTo(minVersion) < 0)
+            else if (result == 0)
             {
-                return (true, false);
+                return (isNeedUpdate, true);
+            }
+            else
+            {
+                return (isNeedUpdate, true);
             }
-
-            return (false, true);
         }
     }
 }