fix versioncode sorting #96

Author: unitycoder

UnityLauncherPro/Data/UnityInstallation.cs

@@ -6,7 +6,7 @@ namespace UnityLauncherPro
     public class UnityInstallation : IValueConverter
     {
         public string Version { set; get; }
-        public int VersionCode { set; get; } // version as int, for sorting
+        public long VersionCode { set; get; } // version as number, for sorting
         public string Path { set; get; } // exe path
         public DateTime? Installed { set; get; }
 

UnityLauncherPro/GetUnityInstallations.cs

@@ -59,7 +59,7 @@ public static UnityInstallation[] Scan()
                     DateTime? installDate = Tools.GetLastModifiedTime(dataFolder);
                     UnityInstallation unity = new UnityInstallation();
                     unity.Version = version;
-                    unity.VersionCode = Tools.VersionAsInt(version); // cached version code
+                    unity.VersionCode = Tools.VersionAsLong(version); // cached version code
                     unity.Path = exePath;
                     unity.Installed = installDate;
                     unity.IsPreferred = (version == MainWindow.preferredVersion);
@@ -92,7 +92,7 @@ public static UnityInstallation[] Scan()
         public static bool HasUnityInstallations(string path)
         {
             var directories = Directory.GetDirectories(path);
-            
+
             // loop folders inside root
             for (int i = 0, length = directories.Length; i < length; i++)
             {
@@ -101,7 +101,7 @@ public static bool HasUnityInstallations(string path)
 
                 var editorExe = Path.Combine(editorFolder, "Unity.exe");
                 if (File.Exists(editorExe) == false) continue;
-                
+
                 // have atleast 1 installation
                 return true;
             }

UnityLauncherPro/MainWindow.xaml.cs

@@ -2894,7 +2894,7 @@ public int Compare(Object a, Object b)
                         if (((Updates)a).Version == null && ((Updates)b).Version == null) return 0;
                         if (((Updates)a).Version == null) return direction == ListSortDirection.Ascending ? -1 : 1;
                         if (((Updates)b).Version == null) return direction == ListSortDirection.Ascending ? 1 : -1;
-                        return direction == ListSortDirection.Ascending ? Tools.VersionAsInt(((Updates)a).Version).CompareTo(Tools.VersionAsInt(((Updates)b).Version)) : Tools.VersionAsInt(((Updates)b).Version).CompareTo(Tools.VersionAsInt(((Updates)a).Version));
+                        return direction == ListSortDirection.Ascending ? Tools.VersionAsLong(((Updates)a).Version).CompareTo(Tools.VersionAsLong(((Updates)b).Version)) : Tools.VersionAsLong(((Updates)b).Version).CompareTo(Tools.VersionAsLong(((Updates)a).Version));
                     case "Released":
                         // handle null values
                         if (((Updates)a).ReleaseDate == null && ((Updates)b).ReleaseDate == null) return 0;
@@ -2961,7 +2961,7 @@ public int Compare(Object a, Object b)
                         if (((Project)a).Version == null && ((Project)b).Version == null) return 0;
                         if (((Project)a).Version == null) return direction == ListSortDirection.Ascending ? -1 : 1;
                         if (((Project)b).Version == null) return direction == ListSortDirection.Ascending ? 1 : -1;
-                        return direction == ListSortDirection.Ascending ? Tools.VersionAsInt(((Project)a).Version).CompareTo(Tools.VersionAsInt(((Project)b).Version)) : Tools.VersionAsInt(((Project)b).Version).CompareTo(Tools.VersionAsInt(((Project)a).Version));
+                        return direction == ListSortDirection.Ascending ? Tools.VersionAsLong(((Project)a).Version).CompareTo(Tools.VersionAsLong(((Project)b).Version)) : Tools.VersionAsLong(((Project)b).Version).CompareTo(Tools.VersionAsLong(((Project)a).Version));
                     case "Path":
                         return direction == ListSortDirection.Ascending ? ((Project)a).Path.CompareTo(((Project)b).Path) : ((Project)b).Path.CompareTo(((Project)a).Path);
                     case "Modified":

UnityLauncherPro/Tools.cs

@@ -662,7 +662,7 @@ public static string FindNearestVersion(string currentVersion, List<string> allA
             allAvailable.Add(currentVersion);
 
             // sort list
-            allAvailable.Sort((s1, s2) => VersionAsInt(s2).CompareTo(VersionAsInt(s1)));
+            allAvailable.Sort((s1, s2) => VersionAsLong(s2).CompareTo(VersionAsLong(s1)));
 
             // check version above our current version
             int currentIndex = allAvailable.IndexOf(currentVersion);
@@ -676,9 +676,9 @@ public static string FindNearestVersion(string currentVersion, List<string> allA
         }
 
         // returns version as integer, for easier sorting between versions: 2019.4.19f1 = 2019041901
-        public static int VersionAsInt(string version)
+        public static long VersionAsLong(string version)
         {
-            int result = 0;
+            long result = 0;
 
             // cleanup 32bit version name, TODO is this needed anymore?
             string cleanVersion = version.Replace("(32-bit)", "");
@@ -694,12 +694,12 @@ public static int VersionAsInt(string version)
             string[] splitted = cleanVersion.Split('.');
             if (splitted.Length > 1)
             {
-                int multiplier = 1;
-                for (int i = 0, length = splitted.Length; i < length; i++)
+                long multiplier = 1;
+                for (long i = 0, length = splitted.Length; i < length; i++)
                 {
-                    int n = int.Parse(splitted[length - 1 - i]);
+                    long n = int.Parse(splitted[length - 1 - i]);
                     result += n * multiplier;
-                    multiplier *= 10;
+                    multiplier *= 50;
                 }
             }
             return result;