add target platform column (checked from Assembly-CSharp.csproj) and setting, rename GITBranch column header to Branch

Author: unitycoder

UnityLauncherPro/App.config

@@ -63,6 +63,9 @@
             <setting name="streamerMode" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="showTargetPlatform" serializeAs="String">
+                <value>False</value>
+            </setting>
         </UnityLauncherPro.Properties.Settings>
     </userSettings>
 </configuration>

UnityLauncherPro/Data/Project.cs

@@ -11,11 +11,12 @@ public class Project
         public DateTime? Modified { set; get; }
         public string Arguments { set; get; }
         public string GITBranch { set; get; }
+        public string TargetPlatform { set; get; }
         public Process Process; // launched unity exe
 
         public override string ToString()
         {
-            return $"{Title} {Version} {Path} {Modified} {Arguments} {GITBranch} ";
+            return $"{Title} {Version} {Path} {Modified} {Arguments} {GITBranch} {TargetPlatform}";
         }
 
     }

UnityLauncherPro/GetProjects.cs

@@ -11,7 +11,7 @@ public static class GetProjects
         // which registries we want to scan for projects
         static readonly string[] registryPathsToCheck = new string[] { @"SOFTWARE\Unity Technologies\Unity Editor 5.x", @"SOFTWARE\Unity Technologies\Unity Editor 4.x" };
 
-        public static List<Project> Scan(bool getGitBranch = false, bool getArguments = false, bool showMissingFolders = false)
+        public static List<Project> Scan(bool getGitBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false)
         {
             List<Project> projectsFound = new List<Project>();
 
@@ -86,7 +86,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
                             csprojFile = Path.Combine(projectPath, projectName + ".Editor.csproj");
                         }
 
-                        // maybe 4.x project
+                        // maybe 4.x project, NOTE recent versions also have this as default
                         if (File.Exists(csprojFile) == false)
                         {
                             csprojFile = Path.Combine(projectPath, "Assembly-CSharp.csproj");
@@ -112,13 +112,45 @@ public static List<Project> Scan(bool getGitBranch = false, bool getArguments =
                             gitBranch = Tools.ReadGitBranchInfo(projectPath);
                         }
 
+                        // TODO add option to disable check
+                        string targetPlatform = "";
+                        if (showTargetPlatform == true)
+                        {
+                            // get buildtarget from .csproj
+                            // <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
+                            // get main csproj file
+                            var csproj = Path.Combine(projectPath, "Assembly-CSharp.csproj");
+                            // TODO check projname also, if no assembly-.., NOTE already checked above
+                            //var csproj = Path.Combine(projectPath, projectName + ".csproj");
+                            if (File.Exists(csproj))
+                            {
+                                var csprojtxt = File.ReadAllText(csproj);
+                                var csprojsplit = csprojtxt.Split(new[] { "<UnityBuildTarget>" }, StringSplitOptions.None);
+                                if (csprojsplit != null && csprojsplit.Length > 1)
+                                {
+                                    var endrow = csprojsplit[1].IndexOf(":");
+                                    if (endrow > -1)
+                                    {
+                                        Console.WriteLine("build target: " + csprojsplit[1].Substring(0, endrow));
+                                        // 5.6 : win32, win64, osx, linux, linux64, ios, android, web, webstreamed, webgl, xboxone, ps4, psp2, wsaplayer, tizen, samsungtv
+                                        // 2017: standalone, Win, Win64, OSXUniversal, Linux, Linux64, LinuxUniversal, iOS, Android, Web, WebStreamed, WebGL, XboxOne, PS4, PSP2, WindowsStoreApps, Switch, WiiU, N3DS, tvOS, PSM
+                                        // 2018: standalone, Win, Win64, OSXUniversal, Linux, Linux64, LinuxUniversal, iOS, Android, Web, WebStreamed, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, N3DS, tvOS
+                                        // 2019: Standalone, Win, Win64, OSXUniversal, Linux64, iOS, Android, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, tvOS
+                                        // 2020: Standalone, Win, Win64, OSXUniversal, Linux64, iOS, Android, WebGL, XboxOne, PS4, WindowsStoreApps, Switch, tvOS
+                                        targetPlatform = csprojsplit[1].Substring(0, endrow);
+                                    }
+                                }
+                            }
+                        }
+
                         var p = new Project();
                         p.Title = projectName;
                         p.Version = projectVersion;
                         p.Path = projectPath;
                         p.Modified = lastUpdated;
                         p.Arguments = customArgs;
                         p.GITBranch = gitBranch;
+                        p.TargetPlatform = targetPlatform;
 
                         // if want to hide project and folder path for screenshot
                         //p.Title = "Hidden Project";

UnityLauncherPro/MainWindow.xaml

@@ -322,7 +322,9 @@
 							<DataGridTextColumn x:Name="txtColumnName" CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Path}" ClipboardContentBinding="{x:Null}" Header="Path" IsReadOnly="True" Width="185"/>
 							<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Modified, StringFormat=\{0:dd/MM/yyyy HH:mm:ss\}}" ClipboardContentBinding="{x:Null}" Header="Modified" IsReadOnly="True" Width="120"/>
 							<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding Arguments}" ClipboardContentBinding="{x:Null}" Header="Arguments" IsReadOnly="False" Width="100"/>
-							<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding GITBranch}" ClipboardContentBinding="{x:Null}" Header="GITBranch" IsReadOnly="True" Width="100"/>
+							<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding GITBranch}" ClipboardContentBinding="{x:Null}" Header="Branch" IsReadOnly="True" Width="100"/>
+							<!--TODO platform as dropdown?-->
+							<DataGridTextColumn CellStyle="{StaticResource NoFocusCellStyle}" Binding="{Binding TargetPlatform}" ClipboardContentBinding="{x:Null}" Header="Platform" IsReadOnly="True" Width="100"/>
 						</DataGrid.Columns>
 
 						<!-- right click context menu -->
@@ -686,6 +688,7 @@
 						<CheckBox x:Name="chkEnableProjectRename" Content="Enable Project Renaming (Not recommended for beginners)" Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" ToolTip="Can use F2 to rename project folders, Note that project will disappears from list on refresh, unless you open it (since its new path, not in unity recent projects registry)" Checked="ChkEnableProjectRename_Checked" Unchecked="ChkEnableProjectRename_Checked"/>
 						<CheckBox x:Name="chkAskNameForQuickProject" Content="Ask name for New Project" Foreground="{DynamicResource ButtonForeground}" Checked="ChkAskNameForQuickProject_Checked" Unchecked="ChkAskNameForQuickProject_Checked" Margin="0,0,0,3" ToolTip="If disabled, uses automatic quick project naming"/>
 						<CheckBox x:Name="chkStreamerMode" Content="Streamer Mode (hide project names and folders)" Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" ToolTip="" Checked="ChkStreamerMode_Checked" Unchecked="ChkStreamerMode_Checked"/>
+						<CheckBox x:Name="chkShowPlatform" Content="Show current target platform (if exists in .csproj)" Foreground="{DynamicResource ButtonForeground}" Margin="0,0,0,3" ToolTip="" Checked="ChkShowPlatform_Checked" Unchecked="ChkShowPlatform_Checked"/>
 
 						<StackPanel Grid.Row="3" Orientation="Horizontal">
 							<Label Content="Root Folder for New Projects" Foreground="{DynamicResource ButtonForeground}" />

UnityLauncherPro/MainWindow.xaml.cs

@@ -85,7 +85,7 @@ void Start()
             }
 
             // update projects list
-            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked);
+            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked);
             gridRecent.Items.Clear();
             gridRecent.ItemsSource = projectsSource;
 
@@ -251,10 +251,12 @@ void LoadSettings()
             chkAskNameForQuickProject.IsChecked = Properties.Settings.Default.askNameForQuickProject;
             chkEnableProjectRename.IsChecked = Properties.Settings.Default.enableProjectRename;
             chkStreamerMode.IsChecked = Properties.Settings.Default.streamerMode;
+            chkShowPlatform.IsChecked = Properties.Settings.Default.showTargetPlatform;
 
             // update optional grid columns, hidden or visible
             gridRecent.Columns[4].Visibility = (bool)chkShowLauncherArgumentsColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
             gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
+            gridRecent.Columns[6].Visibility = (bool)chkShowPlatform.IsChecked ? Visibility.Visible : Visibility.Collapsed;
 
             // update installations folder listbox
             lstRootFolders.Items.Clear();
@@ -409,7 +411,7 @@ void RefreshRecentProjects()
             // take currently selected project row
             lastSelectedProjectIndex = gridRecent.SelectedIndex;
             // rescan recent projects
-            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked);
+            projectsSource = GetProjects.Scan(getGitBranch: (bool)chkShowGitBranchColumn.IsChecked, getArguments: (bool)chkShowLauncherArgumentsColumn.IsChecked, showMissingFolders: (bool)chkShowMissingFolderProjects.IsChecked, showTargetPlatform: (bool)chkShowPlatform.IsChecked);
             gridRecent.ItemsSource = projectsSource;
             // focus back
             Tools.SetFocusToGrid(gridRecent, lastSelectedProjectIndex);
@@ -1050,6 +1052,7 @@ private void ChkShowGitBranchColumn_CheckedChanged(object sender, RoutedEventArg
             gridRecent.Columns[5].Visibility = (bool)chkShowGitBranchColumn.IsChecked ? Visibility.Visible : Visibility.Collapsed;
         }
 
+
         private void ChkQuitAfterOpen_CheckedChanged(object sender, RoutedEventArgs e)
         {
             Properties.Settings.Default.closeAfterProject = (bool)chkQuitAfterOpen.IsChecked;
@@ -1385,7 +1388,7 @@ private void ChkAskNameForQuickProject_Checked(object sender, RoutedEventArgs e)
         bool isInitializing = true; // used to avoid doing things while still starting up
         private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
         {
-            var isChecked = (bool)chkStreamerMode.IsChecked;
+            var isChecked = (bool)((CheckBox)sender).IsChecked;
 
             Properties.Settings.Default.streamerMode = isChecked;
             Properties.Settings.Default.Save();
@@ -1396,7 +1399,23 @@ private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
             txtColumnTitle.CellStyle = isChecked ? cellStyle : null;
             txtColumnName.CellStyle = isChecked ? cellStyle : null;
 
-            // need to reload list if user clicked
+            // need to reload list if user changed setting
+            if (isInitializing == false)
+            {
+                RefreshRecentProjects();
+            }
+        }
+
+        private void ChkShowPlatform_Checked(object sender, RoutedEventArgs e)
+        {
+            var isChecked = (bool)((CheckBox)sender).IsChecked;
+
+            Properties.Settings.Default.showTargetPlatform = isChecked;
+            Properties.Settings.Default.Save();
+
+            gridRecent.Columns[6].Visibility = (bool)chkShowPlatform.IsChecked ? Visibility.Visible : Visibility.Collapsed;
+
+            // need to reload list if user changed setting
             if (isInitializing == false)
             {
                 RefreshRecentProjects();
@@ -1606,6 +1625,8 @@ private void BtnClearBuildReport_Click(object sender, RoutedEventArgs e)
         {
             gridBuildReport.ItemsSource = null;
         }
+
+
     } // class
 } //namespace
 

UnityLauncherPro/Properties/Settings.Designer.cs

@@ -56,5 +56,8 @@
     <Setting Name="streamerMode" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="showTargetPlatform" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>