PixiEditor · pengweiqhca · Apr 11, 2026
diff --git a/...o.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/ColorPickerDemo.AvaloniaUI.Android.csproj b/...o.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/ColorPickerDemo.AvaloniaUI.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0-android</TargetFramework>
+        <TargetFramework>net8.0-android</TargetFramework>
         <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
         <ApplicationId>com.CompanyName.ColorPickerDemo.AvaloniaUI</ApplicationId>

diff --git a/...rPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/MainActivity.cs b/...rPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/MainActivity.cs
@@ -5,8 +5,9 @@
 namespace ColorPickerDemo.AvaloniaUI.Android;
 
 [Activity(Label = "ColorPickerDemo.AvaloniaUI.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon",
+    MainLauncher = true,
     LaunchMode = LaunchMode.SingleTop,
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity
 {
-}
+}
diff --git a/...ickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/SplashActivity.cs b/...ickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Android/SplashActivity.cs
@@ -4,7 +4,7 @@
 using Application = Android.App.Application;
 using Avalonia;
 using Avalonia.Android;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace ColorPickerDemo.AvaloniaUI.Android;
 
@@ -15,7 +15,7 @@ protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return base.CustomizeAppBuilder(builder)
             .WithInterFont()
-            .UseReactiveUI();
+            .UseReactiveUI(_ => { });
     }
 
     protected override void OnCreate(Bundle? savedInstanceState)
@@ -29,4 +29,4 @@ protected override void OnResume()
 
         StartActivity(new Intent(Application.Context, typeof(MainActivity)));
     }
-}
+}
diff --git a/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Browser/Program.cs b/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Browser/Program.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using ColorPickerDemo.AvaloniaUI;
 
 [assembly: SupportedOSPlatform("browser")]
@@ -13,7 +13,7 @@ private static async Task Main(string[] args)
     {
         await BuildAvaloniaApp()
             .WithInterFont()
-            .UseReactiveUI()
+            .UseReactiveUI(_ => { })
             .StartBrowserAppAsync("out");
     }
 

diff --git a/...o.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Desktop/ColorPickerDemo.AvaloniaUI.Desktop.csproj b/...o.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Desktop/ColorPickerDemo.AvaloniaUI.Desktop.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
-        One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
@@ -14,8 +12,6 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Desktop/Program.cs b/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.Desktop/Program.cs
@@ -1,6 +1,6 @@
 using System;
 using Avalonia;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace ColorPickerDemo.AvaloniaUI.Desktop;
 
@@ -23,6 +23,6 @@ public static AppBuilder BuildAvaloniaApp()
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseReactiveUI();
+            .UseReactiveUI(_ => { });
     }
-}
+}
diff --git a/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.iOS/AppDelegate.cs b/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.iOS/AppDelegate.cs
@@ -4,7 +4,7 @@
 using Avalonia.Controls;
 using Avalonia.iOS;
 using Avalonia.Media;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace ColorPickerDemo.AvaloniaUI.iOS;
 
@@ -18,6 +18,6 @@ protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return base.CustomizeAppBuilder(builder)
             .WithInterFont()
-            .UseReactiveUI();
+            .UseReactiveUI(_ => { });
     }
-}
+}
diff --git a/...ickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.iOS/ColorPickerDemo.AvaloniaUI.iOS.csproj b/...ickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.iOS/ColorPickerDemo.AvaloniaUI.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0-ios</TargetFramework>
+        <TargetFramework>net8.0-ios</TargetFramework>
         <SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>
         <ProvisioningType>manual</ProvisioningType>
         <Nullable>enable</Nullable>

diff --git a/...o/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.csproj b/...o/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI/ColorPickerDemo.AvaloniaUI.csproj
@@ -15,9 +15,7 @@
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)"/>
         <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="ReactiveUI.Avalonia" Version="11.*"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/Directory.Build.props b/ColorPickerDemo/ColorPickerDemo.AvaloniaUI/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
         <Nullable>enable</Nullable>
-        <AvaloniaVersion>11.2.5</AvaloniaVersion>
+        <AvaloniaVersion>12.0.0</AvaloniaVersion>
     </PropertyGroup>
 </Project>
diff --git a/src/ColorPicker.AvaloniaUI/Behaviors/TextBoxFocusBehavior.cs b/src/ColorPicker.AvaloniaUI/Behaviors/TextBoxFocusBehavior.cs
@@ -72,18 +72,12 @@ private void AssociatedObject_KeyUp(object sender, KeyEventArgs e)
 
     private void RemoveFocus()
     {
-        var focusManager = TopLevel.GetTopLevel(AssociatedObject).FocusManager;
-        var current = focusManager.GetFocusedElement();
-        if (current != null)
-        {
-            //TODO: Find non obsolete way to do this
-            var next = KeyboardNavigationHandler.GetNext(AssociatedObject, NavigationDirection.Next);
-            next?.Focus(NavigationMethod.Tab);
-        }
+        var focusManager = TopLevel.GetTopLevel(AssociatedObject)?.FocusManager;
+        focusManager?.TryMoveFocus(NavigationDirection.Next);
     }
 
     private void AssociatedObjectGotKeyboardFocus(
-        object sender, GotFocusEventArgs e)
+        object sender, FocusChangedEventArgs e)
     {
         if (SelectOnMouseClick || e.NavigationMethod == NavigationMethod.Tab)
         {

diff --git a/src/ColorPicker.AvaloniaUI/ColorPicker.AvaloniaUI.csproj b/src/ColorPicker.AvaloniaUI/ColorPicker.AvaloniaUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -31,8 +31,8 @@ Originally developed for PixiEditor: https://github.com/PixiEditor/PixiEditor.</
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.5" />
-        <PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.0.5" />
+        <PackageReference Include="Avalonia" Version="12.0.0" />
+        <PackageReference Include="Xaml.Behaviors.Interactivity" Version="12.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/ColorPicker.AvaloniaUI/Templates/HueSlider.axaml b/src/ColorPicker.AvaloniaUI/Templates/HueSlider.axaml
@@ -16,7 +16,7 @@
                                    Source="{StaticResource masterImage}"
                                    IsHitTestVisible="False">
                                 <Image.OpacityMask>
-                                    <RadialGradientBrush GradientOrigin="50%,50%" Center="50%, 50%" Radius="0.5">
+                                    <RadialGradientBrush GradientOrigin="50%,50%" Center="50%, 50%" RadiusX="0.5" RadiusY="0.5">
                                         <RadialGradientBrush.GradientStops>
                                             <GradientStop Color="Transparent" Offset="0" />
                                             <GradientStop Color="Transparent" Offset="0.839" />