From d592e9435e0b6862bbf1639bcec8abc59026d7c2 Mon Sep 17 00:00:00 2001 From: MBucari Date: Wed, 4 Dec 2024 19:11:36 -0700 Subject: [PATCH 1/2] Fix main window closing when dialog is closed (#1065) --- Source/LibationAvalonia/Program.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/LibationAvalonia/Program.cs b/Source/LibationAvalonia/Program.cs index 4d4c46c8..1516af80 100644 --- a/Source/LibationAvalonia/Program.cs +++ b/Source/LibationAvalonia/Program.cs @@ -46,11 +46,6 @@ namespace LibationAvalonia try { var config = LibationScaffolding.RunPreConfigMigrations(); - - //Start as much work in parallel as possible. - var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime()); - var appBuilderTask = Task.Run(BuildAvaloniaApp); - if (config.LibationSettingsAreValid) { // most migrations go in here @@ -62,9 +57,7 @@ namespace LibationAvalonia App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true)); } - appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult()); - - classicLifetimeTask.Result.Start(null); + BuildAvaloniaApp().StartWithClassicDesktopLifetime(null); } catch (Exception ex) { From 4576c0e19341ae45efa8a18b03a12d77c7ad896b Mon Sep 17 00:00:00 2001 From: MBucari Date: Wed, 4 Dec 2024 19:12:59 -0700 Subject: [PATCH 2/2] Updata Avalonia to 11.2.2 --- Source/LibationAvalonia/LibationAvalonia.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index b6198112..1bacdc74 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -74,13 +74,13 @@ - - - + + + - - - + + +