Updated versions and deps

royalapplications · Jan 8, 2025 · 9ed791f · 9ed791f
1 parent dadb589
commit 9ed791f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/InteropDemo.csproj b/src/RoyalApps.Community.Avalonia.InteropDemo/InteropDemo/InteropDemo.csproj
@@ -25,13 +25,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
+    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
 
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/RoyalApps.Community.Avalonia.Windows/NativeControls/WinFormsControlHost.cs b/src/RoyalApps.Community.Avalonia.Windows/NativeControls/WinFormsControlHost.cs
@@ -48,11 +48,8 @@ protected sealed override IPlatformHandle CreateNativeControlCore(IPlatformHandl
     /// If not implemented, the instance will be created automatically.
     /// </summary>
     /// <returns>An instance of the WinForms control to host.</returns>
-    protected virtual T? OnCreateWinFormsControl()
-    {
-        return null;
-    }
-
+    protected virtual T? OnCreateWinFormsControl() => null;
+
     /// <inheritdoc cref="DestroyNativeControlCore"/>
     protected sealed override void DestroyNativeControlCore(IPlatformHandle control)
     {

diff --git a/src/RoyalApps.Community.Avalonia.Windows/NativeControls/WinFormsLifetimeManager.cs b/src/RoyalApps.Community.Avalonia.Windows/NativeControls/WinFormsLifetimeManager.cs
@@ -21,16 +21,10 @@ public void AddControl(IDisposeWinFormsControl viewModel, Control control)
         viewModel.DisposeWinFormsControl += DisposeWinFormsControl;
     }
 
-    public Control? GetControl(IDisposeWinFormsControl? viewModel)
-    {
-        if (viewModel == null)
-            return null;
-
-        return _controls.TryGetValue(viewModel, out var existingInstance) 
-            ? existingInstance 
-            : null;
-    }
-
+    public Control? GetControl(IDisposeWinFormsControl? viewModel) => viewModel == null 
+        ? null 
+        : _controls.GetValueOrDefault(viewModel);
+
     private void DisposeWinFormsControl(object? sender, WinFormsDisposeEventArgs e)
     {
         var viewModel = e.ViewModel;

diff --git a/src/RoyalApps.Community.Avalonia.Windows/RoyalApps.Community.Avalonia.Windows.csproj b/src/RoyalApps.Community.Avalonia.Windows/RoyalApps.Community.Avalonia.Windows.csproj
@@ -12,11 +12,11 @@
         <PackageIcon>RoyalApps_1024.png</PackageIcon>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RootNamespace>RoyalApps.Community.Avalonia.Windows</RootNamespace>
-        <Version>1.1.0-beta1</Version>
+        <Version>1.2.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <TargetFrameworks>net8.0-windows;net9.0-windows</TargetFrameworks>
         <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
         <Configurations>Debug;Release</Configurations>
         <Platforms>x64;ARM64</Platforms>
@@ -29,7 +29,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.1.3" />
+        <PackageReference Include="Avalonia" Version="11.2.0" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>