URI Updteas, added program config, starting on sub version stuff

Author: Firestack

UnityMultiLauncher/Controls/Converters/UnityUriToUnityVersion.cs

@@ -31,7 +31,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 		public string ConvertInternal(Uri unity)
 		{
 			var versionInfo = Util.GetUnityVersionFromExecutable(unity);
-			return string.Format("{0}.{1}.{2}", versionInfo.Item1, versionInfo.Item2, versionInfo.Item3);
+			return "{0}.{1}.{2}".Format( versionInfo.Item1, versionInfo.Item2, versionInfo.Item3);
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

UnityMultiLauncher/Models/ProgramConfig.cs

@@ -54,5 +54,7 @@ public Tuple<AppTheme, Accent> appStyle
 		public string appAccent = "Blue";
 
 		public HashSet<Uri> unityExeLocations = new HashSet<Uri>();
+
+		public bool ShouldUseUnitySubVersion = false;
 	}
 }

UnityMultiLauncher/Models/Utility.cs

@@ -70,5 +70,15 @@ public static Tuple<int, int, int, int> GetUnityVersionFromExecutable(Uri exec)
 			var versionInfo = FileVersionInfo.GetVersionInfo(exec.LocalPath);
 			return Tuple.Create(versionInfo.ProductMajorPart, versionInfo.ProductMinorPart, versionInfo.ProductBuildPart, 0);
 		}
+
+		public static void DumpUnityVersionInfo(Uri exec)
+		{
+			var versionInfo = FileVersionInfo.GetVersionInfo(exec.LocalPath);
+			System.Threading.Tasks.Task.Run(() => Newtonsoft.Json.JsonConvert.SerializeObject(versionInfo)).ContinueWith((input) => {
+				System.IO.File.WriteAllText(versionInfo.ProductName + "_" + versionInfo.ProductVersion + ".json", input.Result);
+				
+			})
+
+;		}
 	}
 }

UnityMultiLauncher/ViewModels/UnityViewModel.cs

@@ -213,6 +213,8 @@ public Uri selectedVersion
 			}
 		}
 
+		public bool SupportUnitySubversion { get; set; }
+
 		public ViewCommand launchUnity
 		{
 			get
@@ -276,5 +278,32 @@ public ViewCommand unitySelectVersionDialog
 				return GetProperty() as ViewCommand ?? SetProperty(new ViewCommand(param => SelectUnityVersionDialog(param as Uri)));
 			}
 		}
+
+		public bool UseUnitySubVersion
+		{
+			get
+			{
+				return ProgramConfig.conf.ShouldUseUnitySubVersion;
+			}
+			set
+			{
+				ProgramConfig.conf.ShouldUseUnitySubVersion = value;
+				ProgramConfig.conf.Save();
+				UpdateProperty();
+			}
+		}
+
+		public void DumpUnityExeInfoFunc(object uri)
+		{
+			Util.DumpUnityVersionInfo(uri as Uri);
+		}
+
+		public ViewCommand DumpUnityExeInfo
+		{
+			get
+			{
+				return GetProperty() as ViewCommand ?? SetProperty(new ViewCommand(DumpUnityExeInfoFunc));
+			}
+		}
 	}
 }

UnityMultiLauncher/ViewModels/Utils/ViewModel.cs

@@ -8,7 +8,7 @@ abstract public class ViewModel : INotifyPropertyChanged
 	{
 		public event PropertyChangedEventHandler PropertyChanged;
 
-		protected void UpdateProperty(string Name)
+		protected void UpdateProperty([CallerMemberName] string Name = null)
 		{
 			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(Name));
 		}

UnityMultiLauncher/Views/MainWindow.xaml

@@ -19,6 +19,9 @@
 	<Controls:MetroWindow.Resources>
 
 
+		<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+
+
 		<VM:UnityViewModel x:Key="unity"/>
 
 		<VM:UtilViewModel x:Key="util"/>
@@ -108,6 +111,8 @@
 					<ComboBox ItemsSource="{Binding appTheme, Source={StaticResource stylevm}}" SelectedIndex="{Binding appThemeSelected, Source={StaticResource stylevm}}" />
 					<Label Content="App Accent"/>
 					<ComboBox ItemsSource="{Binding appAccent, Source={StaticResource stylevm}}" SelectedIndex="{Binding appAccentSelected, Source={StaticResource stylevm}}" />
+					<Label Content="Should Use Unity Release Sub Versions"/>
+					<CheckBox IsChecked="{Binding UseUnitySubVersion, Source={StaticResource unity}}" />
 				</StackPanel>
 
 			</Controls:Flyout>
@@ -147,6 +152,12 @@
 									Command="{Binding removeUnityVersion, Source={StaticResource unity}}" 
 									CommandParameter="{Binding Mode=OneWay}"
 								/>
+								<MenuItem 
+									Header="Dump Unity Info (Send to devs)"
+									Command="{Binding DumpUnityExeInfo, Mode=OneWay, Source={StaticResource unity}}"
+									CommandParameter="{Binding}"
+									Visibility="{Binding UseUnitySubVersion, Converter={StaticResource BooleanToVisibilityConverter}, Source={StaticResource unity}}"
+									/>
 							</ContextMenu>
 						</Button.ContextMenu>
 						<StackPanel>