fix invaliddeployment exception (when loading online template images), fix current selected unity version when creating new empty project, #GITBUILD

Author: unitycoder

UnityLauncherPro/Data/OnlineTemplateItem.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Windows.Media.Imaging;
 
 namespace UnityLauncherPro.Data
 {
@@ -11,6 +12,7 @@ public class OnlineTemplateItem : INotifyPropertyChanged
         public string RenderPipeline { get; set; }
         public string Type { get; set; } // Core, Learning, Sample, 
         public string PreviewImageURL { get; set; }
+        public BitmapImage PreviewImage { get; set; }
         public string TarBallURL { get; set; }
 
         public bool IsDownloaded

UnityLauncherPro/MainWindow.xaml.cs

@@ -866,6 +866,9 @@ private void SaveSettingsOnExit()
 
         public void UpdateUnityInstallationsList()
         {
+            // keep currently selected row
+            var currentSelection = GetSelectedUnity();
+
             // Reset preferred string, if user changed it
             //preferredVersion = "none";
 
@@ -886,8 +889,21 @@ public void UpdateUnityInstallationsList()
             }
 
             lblFoundXInstallations.Content = "Found " + unityInstallationsSource.Count + " installations";
-
             btnCreateEmptyProject.IsEnabled = unityInstallationsSource.Count > 0;
+
+            // try to select previous selection
+            if (currentSelection != null)
+            {
+                for (int i = 0, len = unityInstallationsSource.Count; i < len; i++)
+                {
+                    if (unityInstallationsSource[i].Version == currentSelection.Version && unityInstallationsSource[i].Path == currentSelection.Path)
+                    {
+                        dataGridUnitys.SelectedIndex = i;
+                        Tools.SetFocusToGrid(dataGridUnitys);
+                        break;
+                    }
+                }
+            }
         }
 
         Project GetSelectedProject()
@@ -2100,7 +2116,19 @@ void CreateNewEmptyProject(string targetFolder = null)
                 }
             }
 
-            // refresh unity installations
+            string newVersion = null;
+
+            // if in maintab
+            if (tabControl.SelectedIndex == 0)
+            {
+                newVersion = GetSelectedProject()?.Version == null ? preferredVersion : GetSelectedProject().Version;
+            }
+            else // unity tab
+            {
+                newVersion = (GetSelectedUnity() == null || GetSelectedUnity().Version == null) ? preferredVersion : GetSelectedUnity().Version;
+            }
+
+            // refresh unity installations (so that latest installs are listed)
             UpdateUnityInstallationsList();
 
             if (string.IsNullOrEmpty(initScriptFileFullPath) == true)
@@ -2111,25 +2139,12 @@ void CreateNewEmptyProject(string targetFolder = null)
             // for new projects created from explorer, always ask for name
             if (chkAskNameForQuickProject.IsChecked == true || targetFolder != null)
             {
-                string newVersion = null;
-
-                // if in maintab
-                if (tabControl.SelectedIndex == 0)
-                {
-                    newVersion = GetSelectedProject()?.Version == null ? preferredVersion : GetSelectedProject().Version;
-                }
-                else // unity tab
-                {
-                    newVersion = (GetSelectedUnity() == null || GetSelectedUnity().Version == null) ? preferredVersion : GetSelectedUnity().Version;
-                }
-
                 if (string.IsNullOrEmpty(newVersion))
                 {
                     Console.WriteLine("Missing selected Unity version, probably launching from context menu");
                     newVersion = preferredVersion;
                     // if no preferred version, use latest
                     if (string.IsNullOrEmpty(newVersion)) newVersion = unityInstallationsSource[0].Version;
-
                 }
 
                 string suggestedName = targetFolder != null ? Path.GetFileName(targetFolder) : Tools.GetSuggestedProjectName(newVersion, rootFolder);
@@ -2164,22 +2179,10 @@ void CreateNewEmptyProject(string targetFolder = null)
             }
             else // use automatic name (project is instantly created, without asking anything)
             {
-                string newVersion = null;
-                // if in maintab
-                if (tabControl.SelectedIndex == 0)
-                {
-                    newVersion = GetSelectedProject().Version == null ? preferredVersion : GetSelectedProject().Version;
-                }
-                else // unity tab
-                {
-                    newVersion = GetSelectedUnity().Version == null ? preferredVersion : GetSelectedUnity().Version;
-                }
                 var p = Tools.FastCreateProject(newVersion, rootFolder, null, null, null, null, (bool)chkUseInitScript.IsChecked, initScriptFileFullPath);
-
                 if (p != null) AddNewProjectToList(p);
             }
-
-        }
+        } // CreateNewEmptyProject
 
         private void ChkAskNameForQuickProject_Checked(object sender, RoutedEventArgs e)
         {

UnityLauncherPro/NewProject.xaml

@@ -113,7 +113,7 @@
                     <DataTemplate>
                         <StackPanel Orientation="Vertical" Margin="3">
                             <Grid>
-                                <Image Source="{Binding PreviewImageURL}" 
+                                <Image Source="{Binding PreviewImage}" 
                            Margin="0,0,0,5" 
                            ToolTip="{Binding Description}" 
                            Stretch="Uniform"

UnityLauncherPro/NewProject.xaml.cs

@@ -10,6 +10,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using UnityLauncherPro.Data;
 using UnityLauncherPro.Properties;
 
@@ -524,6 +525,31 @@ private async Task LoadOnlineTemplatesAsync(string baseVersion, CancellationToke
 
                         var templates = ParseTemplatesFromJson(responseString);
 
+                        // Download preview images to bypass WPF's ClickOnce security check on HTTPS URIs
+                        foreach (var template in templates)
+                        {
+                            if (cancellationToken.IsCancellationRequested) return;
+
+                            try
+                            {
+                                if (!string.IsNullOrEmpty(template.PreviewImageURL) && !template.PreviewImageURL.StartsWith("pack://"))
+                                {
+                                    var imageData = await client.GetByteArrayAsync(template.PreviewImageURL);
+                                    var bitmap = new BitmapImage();
+                                    bitmap.BeginInit();
+                                    bitmap.CacheOption = BitmapCacheOption.OnLoad;
+                                    bitmap.StreamSource = new MemoryStream(imageData);
+                                    bitmap.EndInit();
+                                    if (bitmap.CanFreeze) bitmap.Freeze();
+                                    template.PreviewImage = bitmap;
+                                }
+                            }
+                            catch
+                            {
+                                // Failed to download preview image, leave PreviewImage as null
+                            }
+                        }
+
                         // Update UI on dispatcher thread only if not cancelled
                         if (!cancellationToken.IsCancellationRequested)
                         {