Incr ver

Merge pull request #1066 from Mbucari/master
Fix chardonnay window closing (#1065)
2026-01-08 13:58:26 -05:00 · 2024-12-05 14:54:16 -05:00 · 2024-12-05 14:53:11 -05:00 · 2024-12-04 19:12:59 -07:00 · 2024-12-04 19:11:36 -07:00
3 changed files with 8 additions and 15 deletions
--- a/Source/AppScaffolding/AppScaffolding.csproj
+++ b/Source/AppScaffolding/AppScaffolding.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>11.6.1.1</Version>
+    <Version>11.6.2.1</Version>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Octokit" Version="13.0.1" />
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -74,13 +74,13 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Avalonia.Diagnostics" Version="11.2.1" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-		<PackageReference Include="Avalonia" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.2.2" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+		<PackageReference Include="Avalonia" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.2" />
 		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.2" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2" />
 	</ItemGroup>

 	<ItemGroup>
--- 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)
 			{
Author	SHA1	Message	Date
Robert McRackan	c0c99db6fa	Incr ver	2024-12-05 14:54:16 -05:00
rmcrackan	a1c8fb5921	Merge pull request #1066 from Mbucari/master Fix chardonnay window closing (#1065)	2024-12-05 14:53:11 -05:00
MBucari	4576c0e193	Updata Avalonia to 11.2.2	2024-12-04 19:12:59 -07:00
MBucari	d592e9435e	Fix main window closing when dialog is closed (#1065 )	2024-12-04 19:11:36 -07:00