Merge branch 'unitycoder:master' into master

Author: tng2903

UnityLauncherPro/MainWindow.xaml

@@ -732,6 +732,7 @@
                         <DataGrid.ContextMenu>
                             <ContextMenu>
                                 <MenuItem x:Name="menuItemCopyUpdatesVersion" Header="Copy Unity Version" Click="MenuItemCopyVersion_Click" />
+                                <MenuItem x:Name="menuItemCopyUpdateDownloadURL" Header="Copy Download URL" Click="MenuItemCopyUpdateDownloadURL_Click" />
                             </ContextMenu>
                         </DataGrid.ContextMenu>
                         <local:Updates ReleaseDate="2020-10-10" Version="5000.1.2.3"/>

UnityLauncherPro/MainWindow.xaml.cs

@@ -715,6 +715,16 @@ private void MenuItemCopyVersion_Click(object sender, RoutedEventArgs e)
             if (copy != null) Clipboard.SetText(copy);
         }
 
+        // get download url for selected update version
+        private void MenuItemCopyUpdateDownloadURL_Click(object sender, RoutedEventArgs e)
+        {
+            string copy = null;
+            var unity = GetSelectedUpdate();
+            copy = unity?.Version;https://unity3d.com/get-unity/download?thank-you=update&download_nid=65083&os=Win
+            string exeURL = Tools.ParseDownloadURLFromWebpage(copy);
+            if (exeURL != null) Clipboard.SetText(exeURL);
+        }
+
         private void BtnRefreshProjectList_Click(object sender, RoutedEventArgs e)
         {
             // we want to refresh unity installs also, to make sure version colors are correct

UnityLauncherPro/Tools.cs

@@ -430,7 +430,7 @@ public static void DownloadInBrowser(string url, string version)
 
         // parse Unity installer exe from release page
         // thanks to https://github.com/softfruit
-        static string ParseDownloadURLFromWebpage(string version)
+        public static string ParseDownloadURLFromWebpage(string version)
         {
             string url = "";
 

UnityLauncherPro/UpgradeWindow.xaml.cs

@@ -53,8 +53,29 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
                 btnOpenReleasePage.IsEnabled = false;
                 btnDownload.IsEnabled = false;
                 currentVersion = "None";
-                // just select first item then
-                if (gridAvailableVersions != null && gridAvailableVersions.Items.Count > 0) gridAvailableVersions.SelectedIndex = 0;
+
+                // if we have preferred version, and current is null
+                if (string.IsNullOrEmpty(MainWindow.preferredVersion) == false)
+                {
+                    // get correct row for preferred version
+                    var obj = Tools.GetEntry(MainWindow.unityInstalledVersions, MainWindow.preferredVersion);
+                    int index = gridAvailableVersions.Items.IndexOf(obj);
+                    if (index > -1)
+                    {
+                        gridAvailableVersions.SelectedIndex = index;
+                    }
+                    else
+                    {
+                        // just select first item then
+                        gridAvailableVersions.SelectedIndex = 0;
+                    }
+                }
+                else
+                {
+                    // just select first item then
+                    if (gridAvailableVersions != null && gridAvailableVersions.Items.Count > 0) gridAvailableVersions.SelectedIndex = 0;
+                }
+
             }
 
             gridAvailableVersions.Focus();