add "win64" as default platform, add releasetype (lts/alpha/beta) to new project dialog, move releasetype checking to Tools, fix preferred version initial value from "none" to null,

Author: unitycoder

Diff for: UnityLauncherPro/Data/UnityInstallation.cs

@@ -6,7 +6,7 @@ namespace UnityLauncherPro
     public class UnityInstallation : IValueConverter
     {
         public string Version { set; get; }
-        public long VersionCode { set; get; } // version as number, for sorting
+        public long VersionCode { set; get; } // version as number, cached for sorting
         public string Path { set; get; } // exe path
         public DateTime? Installed { set; get; }
 
@@ -16,6 +16,8 @@ public class UnityInstallation : IValueConverter
 
         public bool IsPreferred { set; get; }
 
+        public string ReleaseType { set; get; } // Alpha, Beta, LTS.. TODO could be enum
+
         // https://stackoverflow.com/a/5551986/5452781
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {

Diff for: UnityLauncherPro/MainWindow.xaml.cs

@@ -34,7 +34,7 @@ public partial class MainWindow : Window
         public static ObservableDictionary<string, string> unityInstalledVersions = new ObservableDictionary<string, string>(); // versionID and installation folder
         public static readonly string launcherArgumentsFile = "LauncherArguments.txt";
         public static readonly string projectNameFile = "ProjectName.txt";
-        public static string preferredVersion = "none";
+        public static string preferredVersion = null;
         public static int projectNameSetting = 0; // 0 = folder or ProjectName.txt if exists, 1=ProductName
 
         const string contextRegRoot = "Software\\Classes\\Directory\\Background\\shell";
@@ -310,18 +310,9 @@ private bool UpdatesFilter(object item)
             bool checkedAlphas = (bool)rdoAlphas.IsChecked;
             bool checkedBetas = (bool)rdoBetas.IsChecked;
 
-            bool matchLTS = false;
-            if (checkedLTSs)
-            {
-                var version = unity.Version.Split('.');
-                var versionInt = int.Parse(version[0]);
-                var versionMinor = int.Parse(version[1]);
-                // https://unity3d.com/unity/qa/lts-releases
-                matchLTS = (versionInt >= 2017 && versionMinor == 4) || (versionInt > 2019 && versionMinor == 3);
-            }
-
-            bool matchAlphas = checkedAlphas && unity.Version.IndexOf("a", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
-            bool matchBetas = checkedBetas && unity.Version.IndexOf("b", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
+            bool matchLTS = checkedLTSs && Tools.IsLTS(unity.Version);
+            bool matchAlphas = checkedAlphas && Tools.IsAlpha(unity.Version);
+            bool matchBetas = checkedBetas && Tools.IsBeta(unity.Version);
 
             // match search string and some radiobutton
             if (haveSearchString)
@@ -1804,7 +1795,8 @@ void CreateNewEmptyProject(string targetFolder = null)
                     Console.WriteLine("Missing selected Unity version, probably launching from context menu");
                     newVersion = preferredVersion;
                     // if no preferred version, use latest
-                    if (preferredVersion == null) newVersion = unityInstallationsSource[0].Version;
+                    if (string.IsNullOrEmpty(newVersion)) newVersion = unityInstallationsSource[0].Version;
+
                 }
 
                 var suggestedName = targetFolder != null ? Path.GetFileName(targetFolder) : Tools.GetSuggestedProjectName(newVersion, rootFolder);

Diff for: UnityLauncherPro/NewProject.xaml

@@ -5,15 +5,16 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:UnityLauncherPro"
         mc:Ignorable="d"
-        Title="Create New Project" Height="460" Width="450" Background="{DynamicResource ThemeDarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
+        Title="Create New Project" Height="460" Width="450" Background="{DynamicResource ThemeDarkestBackground}" PreviewKeyDown="Window_PreviewKeyDown" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="True">
 
     <Grid>
         <StackPanel Margin="10,3">
             <Label Content="Unity Version" Foreground="{DynamicResource ThemeButtonForeground}" Margin="0,0,0,3" Padding="5,5,5,3" />
             <DataGrid x:Name="gridAvailableVersions" KeyboardNavigation.TabNavigation = "None" SelectionMode="Single" Height="270" Margin="0" VerticalAlignment="Top" HeadersVisibility="None" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" Foreground="{DynamicResource ThemeButtonForeground}" Background="{DynamicResource ThemeMainBackgroundColor}" SelectionChanged="GridAvailableVersions_SelectionChanged" IsTabStop="True" TabIndex="1"  Loaded="GridAvailableVersions_Loaded" EnableRowVirtualization="False" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Disabled" PreviewMouseDoubleClick="gridAvailableVersions_PreviewMouseDoubleClick">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="Version" Binding="{Binding Version}" IsReadOnly="True" CanUserResize="False" MinWidth="80" />
-                    <DataGridTextColumn Header="Platforms" Binding="{Binding PlatformsCombined}" IsReadOnly="True" CanUserResize="False" MinWidth="370" />
+                    <DataGridTextColumn Header="Platforms" Binding="{Binding PlatformsCombined}" IsReadOnly="True" CanUserResize="False" MinWidth="270" />
+                    <DataGridTextColumn Header="Release" Binding="{Binding ReleaseType}" IsReadOnly="True" CanUserResize="False" MinWidth="70" />
                 </DataGrid.Columns>
             </DataGrid>
 

Diff for: UnityLauncherPro/NewProject.xaml.cs

@@ -38,9 +38,29 @@ public NewProject(string unityVersion, string suggestedName, string targetFolder
             txtNewProjectName.Text = newName;
             lblNewProjectFolder.Content = targetFolder;
 
-            // fill available versions, TODO could show which modules are installed
-            if (gridAvailableVersions.ItemsSource == null) gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;
+            // fill available versions
+            if (gridAvailableVersions.ItemsSource == null)
+            {
+                // get release type info (not done in mainwindow yet, to avoid doing extra stuff)
+                for (int i = 0, len = MainWindow.unityInstallationsSource.Length; i < len; i++)
+                {
+                    var vers = MainWindow.unityInstallationsSource[i].Version;
+                    if (Tools.IsLTS(vers))
+                    {
+                        MainWindow.unityInstallationsSource[i].ReleaseType = "LTS";
+                    }
+                    else if (Tools.IsAlpha(vers))
+                    {
+                        MainWindow.unityInstallationsSource[i].ReleaseType = "Alpha";
+                    }
+                    else if (Tools.IsBeta(vers))
+                    {
+                        MainWindow.unityInstallationsSource[i].ReleaseType = "Beta";
+                    }
+                }
 
+                gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;
+            }
             // we have that version installed
             if (MainWindow.unityInstalledVersions.ContainsKey(unityVersion) == true)
             {

Diff for: UnityLauncherPro/Properties/Settings.Designer.cs

@@ -96,7 +96,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="newProjectPlatform" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">win64</Value>
     </Setting>
     <Setting Name="searchProjectPathAlso" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>

Diff for: UnityLauncherPro/Properties/Settings.settings

@@ -1777,6 +1777,27 @@ public static void SetBuildStatus(Color color)
             mainWindow.Dispatcher.Invoke(() => { mainWindow.SetBuildStatus(color); });
         }
 
+        // https://unity3d.com/unity/alpha
+        public static bool IsAlpha(string version)
+        {
+            return version.IndexOf("a", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
+        }
+
+        // https://unity3d.com/beta/
+        public static bool IsBeta(string version)
+        {
+            return version.IndexOf("b", 0, StringComparison.CurrentCultureIgnoreCase) > -1;
+        }
+
+        // https://unity3d.com/unity/qa/lts-releases
+        public static bool IsLTS(string versionRaw)
+        {
+            var version = versionRaw.Split('.');
+            var versionInt = int.Parse(version[0]);
+            var versionMinor = int.Parse(version[1]);
+            return (versionInt >= 2017 && versionMinor == 4) || (versionInt > 2019 && versionMinor == 3);
+        }
+
     } // class
 
 } // namespace