feat: Improve ResolveTemplateIfNeededByApplicationSettingsLookup with recursiveCallCount

Author: davidkallesen

src/Atc.Installer.Wpf.App/App.xaml.cs

@@ -19,8 +19,6 @@ public App()
     {
         EnsureInstallerDirectoriesIsCreated();
 
-        FixLegacyInstallerFilesLocation();
-
         RestoreInstallerCustomAppSettingsIfNeeded();
 
         UpdateProjectsInstallerFilesIfNeeded();
@@ -123,21 +121,6 @@ private static void EnsureInstallerDirectoriesIsCreated()
         }
     }
 
-    private static void FixLegacyInstallerFilesLocation()
-    {
-        var customAppSettings = new FileInfo(Path.Combine(InstallerTempDirectory.FullName, Constants.CustomAppSettingsFileName));
-        if (customAppSettings.Exists)
-        {
-            File.Move(customAppSettings.FullName, Path.Combine(InstallerProgramDataDirectory.FullName, Constants.CustomAppSettingsFileName));
-        }
-
-        var recentOpenFilesFile = new FileInfo(Path.Combine(InstallerTempDirectory.FullName, Constants.RecentOpenFilesFileName));
-        if (recentOpenFilesFile.Exists)
-        {
-            File.Move(recentOpenFilesFile.FullName, Path.Combine(InstallerProgramDataDirectory.FullName, Constants.RecentOpenFilesFileName));
-        }
-    }
-
     private static void RestoreInstallerCustomAppSettingsIfNeeded()
     {
         var currentFile = new FileInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Constants.CustomAppSettingsFileName));

src/Atc.Installer.Wpf.App/Dialogs/CheckForUpdatesBoxDialogViewModel.cs

@@ -123,7 +123,7 @@ private async Task DownloadLatestCommandHandler()
             if (saveFileDialog.ShowDialog() == true)
             {
                 await File
-                    .WriteAllBytesAsync(saveFileDialog.FileName, downloadBytes)
+                    .WriteAllBytesAsync(saveFileDialog.FileName, downloadBytes, CancellationToken.None)
                     .ConfigureAwait(true);
             }
         }

src/Atc.Installer.Wpf.App/MainWindowViewModel.cs

@@ -163,7 +163,7 @@ private void StartMonitoringServices()
                 while (!cancellationTokenSource.Token.IsCancellationRequested)
                 {
                     await Task
-                        .Delay(3_000, CancellationToken.None)
+                        .Delay(TimeSpan.FromSeconds(3), CancellationToken.None)
                         .ConfigureAwait(true);
 
                     foreach (var vm in ComponentProviders)

src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel.cs

@@ -61,7 +61,7 @@ public ComponentProviderViewModel(
         HostingFramework = applicationOption.HostingFramework;
         IsService = applicationOption.ComponentType is ComponentType.PostgreSqlServer or ComponentType.InternetInformationService or ComponentType.WindowsService;
         InstallationFile = applicationOption.InstallationFile;
-        InstallationFolderPath = applicationOption.InstallationPath;
+        InstallationFolderPath = ResolveTemplateIfNeededByApplicationSettingsLookup(applicationOption.InstallationPath);
         ResolveInstalledMainFile(applicationOption);
 
         foreach (var dependentServiceName in applicationOption.DependentServices)

src/Atc.Installer.Wpf.ComponentProvider/ComponentProviderViewModel_LogicBase.cs

@@ -388,7 +388,8 @@ protected void EnsureFolderPermissions()
     }
 
     protected string ResolveTemplateIfNeededByApplicationSettingsLookup(
-        string value)
+        string value,
+        int recursiveCallCount = 0)
     {
         if (value.ContainsTemplateKeyBrackets())
         {
@@ -415,6 +416,12 @@ protected string ResolveTemplateIfNeededByApplicationSettingsLookup(
             }
         }
 
+        if (recursiveCallCount <= 3 &&
+            value.ContainsTemplateKeyBrackets())
+        {
+            value = ResolveTemplateIfNeededByApplicationSettingsLookup(value, recursiveCallCount + 1);
+        }
+
         return value;
     }
 
@@ -495,17 +502,7 @@ private void ResolveDirectoriesForFolderPermissions()
                 folder = ResolvedVirtuelRootFolder(folder);
             }
 
-            if (folder.ContainsTemplateKeyBrackets())
-            {
-                var keys = folder.GetTemplateKeys();
-                foreach (var key in keys)
-                {
-                    if (TryGetStringFromApplicationSettings(key, out var resultValue))
-                    {
-                        folder = folder.ReplaceTemplateWithKey(key, resultValue);
-                    }
-                }
-            }
+            folder = ResolveTemplateIfNeededByApplicationSettingsLookup(folder);
 
             vm.Directory = new DirectoryInfo(folder);
         }