Fix install workflow

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -6,7 +6,7 @@
 		<TrimMode>copyused</TrimMode>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<IsPublishable>true</IsPublishable>
-
+		<AssemblyName>Hangover</AssemblyName>
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishProtocol>FileSystem</PublishProtocol>
 		<TargetFramework>net6.0</TargetFramework>
 		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+		<SelfContained>true</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 </Project>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+	  <SelfContained>true</SelfContained>
 	  <PublishSingleFile>false</PublishSingleFile>
+	  <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>

Source/LibationAvalonia/App.axaml.cs

@@ -72,7 +72,6 @@ namespace LibationAvalonia
 			var SEGOEUI = new Typeface(new FontFamily(new Uri("avares://Libation/Assets/WINGDING.TTF"), "SEGOEUI_Local"));
 			var gtf = FontManager.Current.GetOrAddGlyphTypeface(SEGOEUI);
 
-
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
 				if (SetupRequired)
@@ -115,28 +114,21 @@ namespace LibationAvalonia
 				// all returns should be preceded by either:
 				// - if config.LibationSettingsAreValid
 				// - error message, Exit()
-
+				if (setupDialog.IsNewUser)
-				if ((!setupDialog.IsNewUser
+				{
-					&& !setupDialog.IsReturningUser) ||
+					setupDialog.Config.SetLibationFiles(Configuration.UserProfile);
-					!await RunInstall(setupDialog))
+					ShowSettingsWindow(desktop, setupDialog.Config, OnSettingsCompleted);
+				}
+				else if (setupDialog.IsReturningUser)
+				{
+					ShowLibationFilesDialog(desktop, setupDialog.Config, OnLibationFilesCompleted);
+				}
+				else
 				{
 					await CancelInstallation();
 					return;
 				}
 
-
-				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(setupDialog.Config);
-
-				await MessageBox.VerboseLoggingWarning_ShowIfTrue();
-
-#if !DEBUG
-				//AutoUpdater.NET only works for WinForms or WPF application projects.
-				//checkForUpdate();
-#endif
-				// logging is init'd here
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(setupDialog.Config);
-
 			}
 			catch (Exception ex)
 			{
@@ -152,32 +144,83 @@ namespace LibationAvalonia
 				}
 				return;
 			}
+		}
+
+		private async Task RunMigrationsAsync(Configuration config)
+		{
+			// most migrations go in here
+			AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+
+			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
+
+			// logging is init'd here
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+		}
+
+		private void ShowSettingsWindow(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, SettingsDialog, Configuration> OnClose)
+		{
+			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
+
+			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
+
+			var settingsDialog = new SettingsDialog();
+			desktop.MainWindow = settingsDialog;
+			settingsDialog.RestoreSizeAndLocation(Configuration.Instance);
+			settingsDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				settingsDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, settingsDialog, config);
+			}
+			settingsDialog.Closing += WindowClosing;
+		}
+
+		private async void OnSettingsCompleted(IClassicDesktopStyleApplicationLifetime desktop, SettingsDialog settingsDialog, Configuration config)
+		{
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
+				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
+				ShowMainWindow(desktop);
+			}
+			else
+				await CancelInstallation();
+
+			settingsDialog.Close();
+		}
+
+
+		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)
+		{
+			var libationFilesDialog = new LibationFilesDialog();
+			desktop.MainWindow = libationFilesDialog;
+			libationFilesDialog.Show();
+
+			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			{
+				libationFilesDialog.Closing -= WindowClosing;
+				e.Cancel = true;
+				OnClose?.Invoke(desktop, libationFilesDialog, config);
+			}
+			libationFilesDialog.Closing += WindowClosing;
+		}
+
+		private async void OnLibationFilesCompleted(IClassicDesktopStyleApplicationLifetime desktop, LibationFilesDialog libationFilesDialog, Configuration config)
+		{
+			config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
+			if (config.LibationSettingsAreValid)
+			{
+				await RunMigrationsAsync(config);
 
 				LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
 				AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
 				ShowMainWindow(desktop);
 			}
-
+			else
-		private static async Task<bool> RunInstall(SetupDialog setupDialog)
 			{
-			var config = setupDialog.Config;
-
-			if (setupDialog.IsNewUser)
-			{
-				config.SetLibationFiles(Configuration.UserProfile);
-			}
-			else if (setupDialog.IsReturningUser)
-			{
-
-				var libationFilesDialog = new LibationFilesDialog();
-
-				if (await libationFilesDialog.ShowDialog<DialogResult>(setupDialog) != DialogResult.OK)
-					return false;
-
-				config.SetLibationFiles(libationFilesDialog.SelectedDirectory);
-				if (config.LibationSettingsAreValid)
-					return true;
-
 				// path did not result in valid settings
 				var continueResult = await MessageBox.Show(
 					$"No valid settings were found at this location.\r\nWould you like to create a new install settings in this folder?\r\n\r\n{libationFilesDialog.SelectedDirectory}",
@@ -185,17 +228,13 @@ namespace LibationAvalonia
 					MessageBoxButtons.YesNo,
 					MessageBoxIcon.Question);
 
-				if (continueResult != DialogResult.Yes)
+				if (continueResult == DialogResult.Yes)
-					return false;
+					ShowSettingsWindow(desktop, config, OnSettingsCompleted);
+				else
+					await CancelInstallation();
+
 			}
-
+			libationFilesDialog.Close();
-			// INIT DEFAULT SETTINGS
-			// if 'new user' was clicked, or if 'returning user' chose new install: show basic settings dialog
-			config.Books ??= Path.Combine(Configuration.UserProfile, "Books");
-
-			AppScaffolding.LibationScaffolding.PopulateMissingConfigValues(config);
-			return await new SettingsDialog().ShowDialog<DialogResult>(setupDialog) == DialogResult.OK
-				&& config.LibationSettingsAreValid;
 		}
 
 		static async Task CancelInstallation()

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

@@ -7,6 +7,7 @@
 		MinWidth="800" MaxWidth="800"
         x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+		WindowStartupLocation="CenterScreen"
         Title="Book Details"
 		Icon="/Assets/libation.ico">
 	

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -23,6 +23,7 @@ namespace LibationAvalonia.Dialogs
 		}
 		private DirSelectOptions dirSelectOptions;
 		public string SelectedDirectory => dirSelectOptions.Directory;
+		public DialogResult DialogResult { get; private set; }
 		public LibationFilesDialog()
 		{
 			InitializeComponent();
@@ -44,7 +45,8 @@ namespace LibationAvalonia.Dialogs
 				return;
 			}
 
-			Close(DialogResult.OK);
+			DialogResult = DialogResult.OK;
+			Close(DialogResult);
 		}
 
 		private void InitializeComponent()

Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishProtocol>FileSystem</PublishProtocol>
 		<TargetFramework>net6.0</TargetFramework>
 		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+		<SelfContained>true</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 </Project>

Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishProtocol>FileSystem</PublishProtocol>
 		<TargetFramework>net6.0</TargetFramework>
 		<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+		<SelfContained>true</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 </Project>

Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs

@@ -70,7 +70,7 @@ namespace LibationAvalonia.Views
 #if !DEBUG
 			//This is temporaty until we have a solution for linux/mac so that
 			//Libation doesn't download a zip every time it runs.
-			if (!App.IsWindows)
+			if (!LibationScaffolding.IsWindows)
 				return;
 
 			try
@@ -85,15 +85,15 @@ namespace LibationAvalonia.Views
 				if (result != DialogResult.Yes)
 					return;
 
-				if (App.IsWindows)
+				if (LibationScaffolding.IsWindows)
 				{ 
 					runWindowsUpgrader(zipFile);
 				}
-				else if (App.IsLinux)
+				else if (LibationScaffolding.IsLinux)
 				{
 
 				}
-				else if (App.IsMacOs)
+				else if (LibationScaffolding.IsMacOs)
 				{
 
 				}

Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishProtocol>FileSystem</PublishProtocol>
 		<TargetFramework>net6.0</TargetFramework>
 		<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+		<SelfContained>true</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 </Project>

Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -10,7 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 		<PublishProtocol>FileSystem</PublishProtocol>
 		<TargetFramework>net6.0</TargetFramework>
 		<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+		<SelfContained>true</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
+		<PublishTrimmed>false</PublishTrimmed>
 	</PropertyGroup>
 </Project>