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 @@
-
-
-
+
+
+
-
-
-
+
+
+
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 @@ static void Main(string[] args)
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 @@ static void Main(string[] args)
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)
{