Incr ver

Merge pull request #1066 from Mbucari/master
Fix chardonnay window closing (#1065)
2026-01-03 19:37:56 -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 · 2024-11-22 17:18:39 -05:00
19 changed files with 24 additions and 31 deletions
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -33,7 +33,7 @@ on:

 env:
  DOTNET_CONFIGURATION: "Release"
-  DOTNET_VERSION: "8.0.x"
+  DOTNET_VERSION: "9.0.x"
  RELEASE_NAME: "chardonnay"

 jobs:
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -18,7 +18,7 @@ on:

 env:
  DOTNET_CONFIGURATION: "Release"
-  DOTNET_VERSION: "8.0.x"
+  DOTNET_VERSION: "9.0.x"

 jobs:
  build:
--- 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.0.1</Version>
+    <Version>11.6.2.1</Version>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Octokit" Version="13.0.1" />
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\classic</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- 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)
 			{
--- a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml
+++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\bin\Publish\classic</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml
+++ b/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\..\bin\Publish\Linux-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml
+++ b/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\..\bin\Publish\MacOS-chardonnay</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
--- a/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml
+++ b/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
    <Platform>Any CPU</Platform>
    <PublishDir>..\..\bin\Publish\classic</PublishDir>
    <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
    <SelfContained>true</SelfContained>
    <PublishSingleFile>false</PublishSingleFile>
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
Robert McRackan	9ce6cb54ab	incr ver	2024-11-22 17:18:39 -05:00
Robert McRackan	c15d49fc64	publish profiles => .net	2024-11-22 17:04:08 -05:00
Robert McRackan	99be869aa9	yaml => .net9	2024-11-22 16:56:16 -05:00