Remove CompareSemVer dup and refactor a bit

Author: bartizan

dev-proxy-abstractions/ProxyUtils.cs

@@ -548,38 +548,47 @@ public static void ValidateSchemaVersion(string schemaUrl, ILogger logger)
     /// </summary>
     /// <param name="a">ver1</param>
     /// <param name="b">ver2</param>
-    /// <returns>Returns 0 if the versions are equal, -1 if a is less than b, and 1 if a is greater than b.</returns>
-    private static int CompareSemVer(string? a, string? b)
+    /// <returns>
+    /// Returns 0 if the versions are equal, -1 if a is less than b, and 1 if a is greater than b.
+    /// An invalid argument is "rounded" to a minimal version.
+    /// </returns>
+    public static int CompareSemVer(string? a, string? b)
     {
-        if (a == null && b == null)
+        if (string.IsNullOrWhiteSpace(a) && string.IsNullOrWhiteSpace(b))
         {
             return 0;
         }
-        else if (a == null)
+        else if (string.IsNullOrWhiteSpace(a))
         {
             return -1;
         }
-        else if (b == null)
+        else if (string.IsNullOrWhiteSpace(b))
         {
             return 1;
         }
 
-        if (a.StartsWith('v'))
-        {
-            a = a[1..];
-        }
-        if (b.StartsWith('v'))
-        {
-            b = b[1..];
-        }
+        a = a.TrimStart('v');
+        b = b.TrimStart('v');
 
         var aParts = a.Split('-');
         var bParts = b.Split('-');
 
-        var aVersion = new Version(aParts[0]);
-        var bVersion = new Version(bParts[0]);
+        var aParsed = Version.TryParse(aParts[0], out var aVersion);
+        var bParsed = Version.TryParse(bParts[0], out var bVersion);
+        if (!aParsed && !bParsed)
+        {
+            return 0;
+        }
+        else if (!aParsed)
+        {
+            return -1;
+        }
+        else if (!bParsed)
+        {
+            return 1;
+        }
 
-        var compare = aVersion.CompareTo(bVersion);
+        var compare = aVersion!.CompareTo(bVersion);
         if (compare != 0)
         {
             // if the versions are different, return the comparison result

dev-proxy/UpdateNotification.cs

@@ -45,7 +45,7 @@ internal static class UpdateNotification
             // -1 = latest release is greater
             // 0 = versions are equal
             // 1 = current version is greater
-            if (CompareSemVer(currentVersion, latestReleaseVersion) < 0)
+            if (ProxyUtils.CompareSemVer(currentVersion, latestReleaseVersion) < 0)
             {
                 return latestRelease;
             }
@@ -60,76 +60,6 @@ internal static class UpdateNotification
         }
     }
 
-    /// <summary>
-    /// Compares two semantic versions strings.
-    /// </summary>
-    /// <param name="a">ver1</param>
-    /// <param name="b">ver2</param>
-    /// <returns>Returns 0 if the versions are equal, -1 if a is less than b, and 1 if a is greater than b.</returns>
-    private static int CompareSemVer(string? a, string? b)
-    {
-        if (a == null && b == null)
-        {
-            return 0;
-        }
-        else if (a == null)
-        {
-            return -1;
-        }
-        else if (b == null)
-        {
-            return 1;
-        }
-
-        if (a.StartsWith('v'))
-        {
-            a = a[1..];
-        }
-        if (b.StartsWith('v'))
-        {
-            b = b[1..];
-        }
-
-        var aParts = a.Split('-');
-        var bParts = b.Split('-');
-
-        var aVersion = new Version(aParts[0]);
-        var bVersion = new Version(bParts[0]);
-
-        var compare = aVersion.CompareTo(bVersion);
-        if (compare != 0)
-        {
-            // if the versions are different, return the comparison result
-            return compare;
-        }
-
-        // if the versions are the same, compare the prerelease tags
-        if (aParts.Length == 1 && bParts.Length == 1)
-        {
-            // if both versions are stable, they are equal
-            return 0;
-        }
-        else if (aParts.Length == 1)
-        {
-            // if a is stable and b is not, a is greater
-            return 1;
-        }
-        else if (bParts.Length == 1)
-        {
-            // if b is stable and a is not, b is greater
-            return -1;
-        }
-        else if (aParts[1] == bParts[1])
-        {
-            // if both versions are prerelease and the tags are the same, they are equal
-            return 0;
-        }
-        else {
-            // if both versions are prerelease, b is greater
-            return -1;
-        }
-    }
-
     private static async Task<ReleaseInfo?> GetLatestReleaseAsync(ReleaseType releaseType)
     {
         var http = new HttpClient();