upgrade project to vs2022, use create new project dialog when opening empty folder project from context menu

Author: unitycoder

UnityLauncherPro/App.config

@@ -16,14 +16,6 @@
             <setting name="windowHeight" serializeAs="String">
                 <value>650</value>
             </setting>
-            <setting name="rootFolders" serializeAs="Xml">
-                <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-                        <string>C:\Program Files\</string>
-                    </ArrayOfString>
-                </value>
-            </setting>
             <setting name="minimizeToTaskbar" serializeAs="String">
                 <value>True</value>
             </setting>
@@ -114,6 +106,13 @@
             <setting name="shortcutBatchFileFolder" serializeAs="String">
                 <value />
             </setting>
+            <setting name="rootFolders" serializeAs="Xml">
+                <value>
+                    <ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <string>C:\Program Files\</string>
+                    </ArrayOfString>
+                </value>
+            </setting>
         </UnityLauncherPro.Properties.Settings>
     </userSettings>
 </configuration>

UnityLauncherPro/MainWindow.xaml

@@ -1012,7 +1012,7 @@
                             <CheckBox  x:Name="chkShowMissingFolderProjects" Content="Show projects that don't exist on disk"  Checked="ChkShowMissingFolderProjects_CheckedChanged" Unchecked="ChkShowMissingFolderProjects_CheckedChanged" ToolTip="List in recent projects, even if the project folder is missing" HorizontalAlignment="Left"/>
                             <CheckBox  x:Name="chkAllowSingleInstanceOnly" Content="Allow single instance only"  Checked="ChkAllowSingleInstanceOnly_CheckedChanged" Unchecked="ChkAllowSingleInstanceOnly_CheckedChanged" ToolTip="Activates already running instance, instead of starting new exe (not working if app is minized to taskbar)" HorizontalAlignment="Left"/>
                             <CheckBox  x:Name="chkEnableProjectRename" Content="Enable Project title rename (F2)"  ToolTip="Renames project title only, DOES NOT rename project folder! New name is saved into ProjectSettings/ProjectName.txt" Checked="ChkEnableProjectRename_Checked" Unchecked="ChkEnableProjectRename_Checked" HorizontalAlignment="Left"/>
-                            <CheckBox x:Name="chkAskNameForQuickProject" Content="Ask name for New Project"  Checked="ChkAskNameForQuickProject_Checked" Unchecked="ChkAskNameForQuickProject_Checked" ToolTip="If disabled, uses automatic quick project naming" HorizontalAlignment="Left"/>
+                            <CheckBox x:Name="chkAskNameForQuickProject" Content="Ask name for New Project"  Checked="ChkAskNameForQuickProject_Checked" Unchecked="ChkAskNameForQuickProject_Checked" ToolTip="If disabled, uses automatic quick project naming (Should be enabled, unless you want instant project creation)" HorizontalAlignment="Left"/>
                             <CheckBox x:Name="chkStreamerMode" Content="Streamer Mode (hide project names and folders)"  ToolTip="Hide project names and folders in main view" Checked="ChkStreamerMode_Checked" Unchecked="ChkStreamerMode_Checked" HorizontalAlignment="Left"/>
                             <CheckBox  x:Name="chkShowPlatform" Content="Show current target platform (if exists in .csproj)"  ToolTip="Shows target platform column" Checked="ChkShowPlatform_Checked" Unchecked="ChkShowPlatform_Checked" HorizontalAlignment="Left"/>
                             <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4">

UnityLauncherPro/MainWindow.xaml.cs

@@ -196,11 +196,19 @@ void HandleCommandLineLaunch()
                     proj.Path = projectPathArgument;
                     proj.Arguments = commandLineArguments;
 
-                    // check if force-update button is down
+                    // no version info or check if force-update button is down
                     // NOTE if keydown, window doesnt become active and focused
                     if (string.IsNullOrEmpty(version) || (Keyboard.Modifiers & ModifierKeys.Shift) != 0)
                     {
-                        Tools.DisplayUpgradeDialog(proj, null);
+                        if (Directory.Exists(Path.Combine(proj.Path, "Assets")) == true)
+                        {
+                            Tools.DisplayUpgradeDialog(proj, null);
+                        }
+                        else // no assets folder here, then its new project
+                        {
+                            //Tools.DisplayUpgradeDialog(proj, null);
+                            CreateNewEmptyProject(proj.Path);
+                        }
                     }
                     else
                     {
@@ -1591,18 +1599,29 @@ private void BtnCreateEmptyProjectUnity_Click(object sender, RoutedEventArgs e)
             CreateNewEmptyProject();
         }
 
-        void CreateNewEmptyProject()
+        void CreateNewEmptyProject(string targetFolder = null)
         {
-            // first check if quick project path is assigned, if not, need to set it
-            if (Directory.Exists(txtRootFolderForNewProjects.Text) == false)
+            string rootFolder = txtRootFolderForNewProjects.Text;
+
+            // if have targetfolder, then use that instead of quick folder
+            if (targetFolder != null && Directory.Exists(targetFolder))
             {
-                tabControl.SelectedIndex = 4;
-                this.UpdateLayout();
-                txtRootFolderForNewProjects.Focus();
-                return;
+                rootFolder = targetFolder;
+            }
+            else
+            {
+                // check if quick root folder is set correctly
+                if (Directory.Exists(rootFolder) == false)
+                {
+                    tabControl.SelectedIndex = 4;
+                    this.UpdateLayout();
+                    txtRootFolderForNewProjects.Focus();
+                    return;
+                }
             }
 
-            if (chkAskNameForQuickProject.IsChecked == true)
+            // for new projects created from explorer, always ask for name
+            if (chkAskNameForQuickProject.IsChecked == true || targetFolder != null)
             {
                 // ask name
                 string newVersion = null;
@@ -1623,7 +1642,7 @@ void CreateNewEmptyProject()
                     return;
                 }
 
-                NewProject modalWindow = new NewProject(newVersion, Tools.GetSuggestedProjectName(newVersion, txtRootFolderForNewProjects.Text), txtRootFolderForNewProjects.Text);
+                NewProject modalWindow = new NewProject(newVersion, Tools.GetSuggestedProjectName(newVersion, rootFolder), rootFolder);
                 modalWindow.ShowInTaskbar = this == null;
                 modalWindow.WindowStartupLocation = this == null ? WindowStartupLocation.CenterScreen : WindowStartupLocation.CenterOwner;
                 modalWindow.Topmost = this == null;
@@ -1634,11 +1653,10 @@ void CreateNewEmptyProject()
 
                 if (results == true)
                 {
-                    var projectPath = txtRootFolderForNewProjects.Text;
-                    Console.WriteLine("Create project " + NewProject.newVersion + " : " + projectPath);
-                    if (string.IsNullOrEmpty(projectPath)) return;
+                    Console.WriteLine("Create project " + NewProject.newVersion + " : " + rootFolder);
+                    if (string.IsNullOrEmpty(rootFolder)) return;
 
-                    var p = Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath, NewProject.platformsForThisUnity, NewProject.selectedPlatform);
+                    var p = Tools.FastCreateProject(NewProject.newVersion, rootFolder, NewProject.newProjectName, NewProject.templateZipPath, NewProject.platformsForThisUnity, NewProject.selectedPlatform);
 
                     // add to list (just in case new project fails to start, then folder is already generated..)
                     if (p != null) AddNewProjectToList(p);
@@ -1649,7 +1667,7 @@ void CreateNewEmptyProject()
                 }
 
             }
-            else // use automatic name
+            else // use automatic name (project is instantly created, without asking anything)
             {
                 string newVersion = null;
                 // if in maintab
@@ -1661,7 +1679,7 @@ void CreateNewEmptyProject()
                 {
                     newVersion = GetSelectedUnity().Version == null ? preferredVersion : GetSelectedUnity().Version;
                 }
-                var p = Tools.FastCreateProject(newVersion, txtRootFolderForNewProjects.Text);
+                var p = Tools.FastCreateProject(newVersion, rootFolder);
                 if (p != null) AddNewProjectToList(p);
             }
 

UnityLauncherPro/Properties/Settings.Designer.cs

@@ -8,12 +8,6 @@
     <Setting Name="windowHeight" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">650</Value>
     </Setting>
-    <Setting Name="rootFolders" Type="System.Collections.Specialized.StringCollection" Scope="User">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;string&gt;C:\Program Files\&lt;/string&gt;
-&lt;/ArrayOfString&gt;</Value>
-    </Setting>
     <Setting Name="minimizeToTaskbar" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
@@ -113,5 +107,11 @@
     <Setting Name="shortcutBatchFileFolder" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="rootFolders" Type="System.Collections.Specialized.StringCollection" Scope="User">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;ArrayOfString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+  &lt;string&gt;C:\Program Files\&lt;/string&gt;
+&lt;/ArrayOfString&gt;</Value>
+    </Setting>
   </Settings>
 </SettingsFile>