Change Version thing again

Author: BombMask

UnityMultiLauncher/Models/Utility.cs

@@ -34,7 +34,7 @@ public static string UnityProjectSettings(Uri project, string key)
 
 		}
 
-		public static Version UnityProjectVersion(Uri project)
+		public static (Version version, string buildType) UnityProjectVersion(Uri project)
 		{
 			var filename = System.IO.Path.Combine(project.LocalPath, @"ProjectSettings\ProjectVersion.txt");
 			if (System.IO.File.Exists(filename))
@@ -44,16 +44,19 @@ public static Version UnityProjectVersion(Uri project)
 				try
 				{
 					//return Version.Parse(Convert.ToInt32(match.Groups[1].Value), Convert.ToInt32(match.Groups[2].Value), Convert.ToInt32(match.Groups[3].Value), Convert.ToInt32(match.Groups[5].Value));
-					return Version.Parse(match.ToString().Replace('f','.'));
-				}
+					var v = Version.Parse(match.ToString().Replace('f','.').Replace('p','.'));
+
+                    if (match.ToString().Contains("p")) { return (v, "p"); }
+                    else{ return (v, "f"); }
+                }
 				catch (Exception E)
 				{
 					E.Data["ProjectText"] = data.ToString();
 					E.Data["Matches"] = match.ToString();
 					throw;
 				}
 			}
-			return null;
+			return (null,null);
 		}
 
 		public static Uri GetUnityExecutableFromVersion(Version version)

UnityMultiLauncher/ViewModels/UnityViewModel.cs

@@ -79,7 +79,7 @@ protected void LaunchProject(Uri projectLocation, Uri unityExe = null)
 			var projectVersion = Util.UnityProjectVersion(projectLocation);
 			if (unityExe == null)
 			{
-				unityExe = Util.GetUnityExecutableFromVersion(projectVersion);
+				unityExe = Util.GetUnityExecutableFromVersion(projectVersion.version);
 			}
 			if (unityExe != null)
 			{
@@ -92,7 +92,7 @@ protected void LaunchProject(Uri projectLocation, Uri unityExe = null)
 				var dialogSettings = new MetroDialogSettings { AnimateHide = false };
 				MainWindow.cwin.ShowMessageAsync(
 					"Unity Not Found",
-					$"The Unity Version For This Project Is Not Installed \n({$"Unity {projectVersion.Major}.{projectVersion.Minor}.{projectVersion.Build}"})",
+					$"The Unity Version For This Project Is Not Installed \n({$"Unity {projectVersion.version.Major}.{projectVersion.version.Minor}.{projectVersion.version.Build}"})",
 					MessageDialogStyle.Affirmative,
 					dialogSettings
 				).ContinueWith(
@@ -131,7 +131,7 @@ protected void SelectUnityVersionDialog(Uri project, MetroDialogSettings dialogS
 			var cd = MainWindow.cwin.TryFindResource("CustomLaunchDialog");
 			MainWindow.cwin.ShowMetroDialogAsync(cd as CustomDialog, dialogSettings);
 			SelectedProject = project;
-			SelectedVersion = Util.GetUnityExecutableFromVersion(Util.UnityProjectVersion(project));
+			SelectedVersion = Util.GetUnityExecutableFromVersion(Util.UnityProjectVersion(project).version);
 		}
 
 		protected void FileSelectDialog()
@@ -208,11 +208,11 @@ public IEnumerable<Tuple<Uri, string, string>> UnityProjectLocations
 					if (System.IO.Directory.Exists(project.LocalPath) && System.IO.Directory.Exists(System.IO.Path.Combine(project.LocalPath, "Assets")))
 					{
 						var projectVersion = Util.UnityProjectVersion(project);
-						if (projectVersion != null)
+						if (projectVersion.version != null)
 							yield return Tuple.Create(
 								project,
 								project.LocalPath.Substring(project.LocalPath.LastIndexOf('\\') + 1),
-								$"{projectVersion.Major}.{projectVersion.Minor}.{projectVersion.Build}f{projectVersion.Revision}"
+								$"{projectVersion.version.Major}.{projectVersion.version.Minor}.{projectVersion.version.Build}{projectVersion.buildType}{projectVersion.version.Revision}"
 							);
 					}
 				}