From 63f448f49049a015b70d128d684a66e9fd4a8e3c Mon Sep 17 00:00:00 2001
From: Dan Clark <dan.clark@videosoftglobal.com>
Date: Thu, 6 Feb 2025 21:21:29 +0000
Subject: [PATCH] Updates

---
 Toolkit.Avalonia/Toolkit.Avalonia.csproj                   | 2 +-
 Toolkit.Foundation/Toolkit.Foundation.csproj               | 6 +++---
 Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj             | 4 ++--
 .../Toolkit.UI.Controls.Avalonia.csproj                    | 6 +++---
 Toolkit.UI.WinUI/ComparisonCondition.cs                    | 2 +-
 Toolkit.UI.WinUI/ComparisonLogic.cs                        | 2 +-
 Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj                   | 7 +++----
 Toolkit.UI.WinUI/WindowExtensions.cs                       | 2 +-
 Toolkit.WinUI/Toolkit.WinUI.csproj                         | 3 +--
 Toolkit.Windows/Toolkit.Windows.csproj                     | 2 +-
 Toolkit.sln                                                | 4 ++--
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Toolkit.Avalonia/Toolkit.Avalonia.csproj b/Toolkit.Avalonia/Toolkit.Avalonia.csproj
index 23358f8..42b15dd 100644
--- a/Toolkit.Avalonia/Toolkit.Avalonia.csproj
+++ b/Toolkit.Avalonia/Toolkit.Avalonia.csproj
@@ -5,7 +5,7 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.1" />
+		<PackageReference Include="Avalonia" Version="11.2.3" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
diff --git a/Toolkit.Foundation/Toolkit.Foundation.csproj b/Toolkit.Foundation/Toolkit.Foundation.csproj
index 25fa759..8c0a477 100644
--- a/Toolkit.Foundation/Toolkit.Foundation.csproj
+++ b/Toolkit.Foundation/Toolkit.Foundation.csproj
@@ -6,9 +6,9 @@
 		<Platforms>AnyCPU;x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview2" />
-		<PackageReference Include="Json.More.Net" Version="2.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="Json.More.Net" Version="2.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
 		<PackageReference Include="System.Reactive" Version="6.0.1" />
 	</ItemGroup>
 </Project>
diff --git a/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj b/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
index fda840d..bb8a25f 100644
--- a/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
+++ b/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
@@ -6,8 +6,8 @@
 		<Platforms>AnyCPU;x64;x86</Platforms>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" />
+		<PackageReference Include="Avalonia" Version="11.2.3" />
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.8" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
diff --git a/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj b/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
index ecb3434..30f460d 100644
--- a/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
+++ b/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
@@ -13,10 +13,10 @@
 	  <AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.1" />
+		<PackageReference Include="Avalonia" Version="11.2.3" />
 		<PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.2.0" />
-		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" />
+		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.8" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.2.0" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />
+		<PackageReference Include="FluentAvaloniaUI" Version="2.2.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Toolkit.UI.WinUI/ComparisonCondition.cs b/Toolkit.UI.WinUI/ComparisonCondition.cs
index 773146a..52c63e5 100644
--- a/Toolkit.UI.WinUI/ComparisonCondition.cs
+++ b/Toolkit.UI.WinUI/ComparisonCondition.cs
@@ -1,5 +1,5 @@
 using Microsoft.UI.Xaml;
-using Microsoft.Xaml.Interactions.Core;
+using Microsoft.Xaml.Interactivity;
 using Toolkit.Foundation;
 
 namespace Toolkit.UI.WinUI;
diff --git a/Toolkit.UI.WinUI/ComparisonLogic.cs b/Toolkit.UI.WinUI/ComparisonLogic.cs
index ceeb98c..fccee56 100644
--- a/Toolkit.UI.WinUI/ComparisonLogic.cs
+++ b/Toolkit.UI.WinUI/ComparisonLogic.cs
@@ -1,4 +1,4 @@
-using Microsoft.Xaml.Interactions.Core;
+using Microsoft.Xaml.Interactivity;
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj b/Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj
index f9d1c54..4fb2c46 100644
--- a/Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj
+++ b/Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj
@@ -10,16 +10,15 @@
 			win10-x86;win10-x64;win10-arm64
 		</RuntimeIdentifiers>
 		<UseWinUI>true</UseWinUI>
-		<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
-		<PackageReference Include="WinUIEx" Version="2.5.0" />
-		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
+		<PackageReference Include="WinUIEx" Version="2.5.1" />
+		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Toolkit.UI.WinUI/WindowExtensions.cs b/Toolkit.UI.WinUI/WindowExtensions.cs
index f715474..7cb3c99 100644
--- a/Toolkit.UI.WinUI/WindowExtensions.cs
+++ b/Toolkit.UI.WinUI/WindowExtensions.cs
@@ -166,7 +166,7 @@ public static partial class WindowExtensions
                     HBRUSH hBrush = PInvoke.CreateSolidBrush(new COLORREF((uint)ToWin32(Color.Black)));
                     _ = PInvoke.FillRect(new HDC((nint)wParam.Value),
                         &rect, hBrush);
-                    _ = PInvoke.DeleteObject(new HGDIOBJ(hBrush));
+                    _ = PInvoke.DeleteObject(new HGDIOBJ((void*)hBrush));
 
                     return new LRESULT(1);
                 }
diff --git a/Toolkit.WinUI/Toolkit.WinUI.csproj b/Toolkit.WinUI/Toolkit.WinUI.csproj
index 57e7954..2baa3cc 100644
--- a/Toolkit.WinUI/Toolkit.WinUI.csproj
+++ b/Toolkit.WinUI/Toolkit.WinUI.csproj
@@ -13,12 +13,11 @@
 			win10-x86;win10-x64;win10-arm64
 		</RuntimeIdentifiers>
 		<UseWinUI>true</UseWinUI>
-		<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
 	</ItemGroup>
 	
 	<ItemGroup>
diff --git a/Toolkit.Windows/Toolkit.Windows.csproj b/Toolkit.Windows/Toolkit.Windows.csproj
index 27d5e91..4c8301b 100644
--- a/Toolkit.Windows/Toolkit.Windows.csproj
+++ b/Toolkit.Windows/Toolkit.Windows.csproj
@@ -11,7 +11,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.162">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/Toolkit.sln b/Toolkit.sln
index 775cb3b..e5b47d0 100644
--- a/Toolkit.sln
+++ b/Toolkit.sln
@@ -75,8 +75,8 @@ Global
 		{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x64.Build.0 = Release|Any CPU
 		{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.ActiveCfg = Release|Any CPU
 		{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.Build.0 = Release|Any CPU
-		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.Build.0 = Debug|x64
+		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.ActiveCfg = Debug|x64
 		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.Build.0 = Debug|x64
 		{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x86.ActiveCfg = Debug|x86