From 79b79bbc707f4172ffe7d92d84211cf4a6195d58 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:15:00 +0100
Subject: [PATCH 01/33] Use ShowNoActivate in Win32NativeControlHost. (#13966)

This prevents a `NativeControlHost` sealing focus on win32.
---
 src/Windows/Avalonia.Win32/Win32NativeControlHost.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
index 620cd64e79..a04e52f410 100644
--- a/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
+++ b/src/Windows/Avalonia.Win32/Win32NativeControlHost.cs
@@ -137,7 +137,7 @@ namespace Avalonia.Win32
                 _holder = holder;
                 _child = child;
                 UnmanagedMethods.SetParent(child.Handle, _holder.Handle);
-                UnmanagedMethods.ShowWindow(child.Handle, UnmanagedMethods.ShowWindowCommand.Show);
+                UnmanagedMethods.ShowWindow(child.Handle, UnmanagedMethods.ShowWindowCommand.ShowNoActivate);
             }
 
             [MemberNotNull(nameof(_holder))]

From 2ba8ac8a738d7081e795d6c28511bd5517138664 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 15 Dec 2023 19:15:56 +0100
Subject: [PATCH 02/33] Don't share style instances with Or selector. (#13969)

* Added failing test for #13910.

* Don't share style instances with Or selector.

Fixes #13910.
---
 src/Avalonia.Base/Styling/ControlTheme.cs     |  2 +-
 src/Avalonia.Base/Styling/Style.cs            |  2 +-
 src/Avalonia.Base/Styling/StyleBase.cs        | 10 +++--
 .../Styling/StyleTests.cs                     | 39 +++++++++++++++++++
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Base/Styling/ControlTheme.cs b/src/Avalonia.Base/Styling/ControlTheme.cs
index 75a3beb907..6cd09e1808 100644
--- a/src/Avalonia.Base/Styling/ControlTheme.cs
+++ b/src/Avalonia.Base/Styling/ControlTheme.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Styling
 
             if (HasSettersOrAnimations && TargetType.IsAssignableFrom(StyledElement.GetStyleKey(target)))
             {
-                Attach(target, null, type);
+                Attach(target, null, type, true);
                 return SelectorMatchResult.AlwaysThisType;
             }
 
diff --git a/src/Avalonia.Base/Styling/Style.cs b/src/Avalonia.Base/Styling/Style.cs
index a5d89392e9..44ffc22e91 100644
--- a/src/Avalonia.Base/Styling/Style.cs
+++ b/src/Avalonia.Base/Styling/Style.cs
@@ -74,7 +74,7 @@ namespace Avalonia.Styling
 
                 if (match.IsMatch)
                 {
-                    Attach(target, match.Activator, type);
+                    Attach(target, match.Activator, type, Selector is not OrSelector);
                 }
 
                 result = match.Result;
diff --git a/src/Avalonia.Base/Styling/StyleBase.cs b/src/Avalonia.Base/Styling/StyleBase.cs
index 318e8d6890..bc3457cb48 100644
--- a/src/Avalonia.Base/Styling/StyleBase.cs
+++ b/src/Avalonia.Base/Styling/StyleBase.cs
@@ -92,20 +92,24 @@ namespace Avalonia.Styling
             return false;
         }
 
-        internal ValueFrame Attach(StyledElement target, IStyleActivator? activator, FrameType type)
+        internal ValueFrame Attach(
+            StyledElement target,
+            IStyleActivator? activator,
+            FrameType type,
+            bool canShareInstance)
         {
             if (target is not AvaloniaObject ao)
                 throw new InvalidOperationException("Styles can only be applied to AvaloniaObjects.");
 
             StyleInstance instance;
 
-            if (_sharedInstance is not null)
+            if (_sharedInstance is not null && canShareInstance)
             {
                 instance = _sharedInstance;
             }
             else
             {
-                var canShareInstance = activator is null;
+                canShareInstance &= activator is null;
 
                 instance = new StyleInstance(this, activator, type);
 
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
index 52bee42d9d..b44078caeb 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyleTests.cs
@@ -1029,6 +1029,28 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.Equal(Brushes.Blue, border.Background);
         }
 
+        [Fact]
+        public void Should_Not_Share_Instance_When_Or_Selector_Is_Present()
+        {
+            // Issue #13910
+            Style style = new Style(x => Selectors.Or(x.OfType<Class1>(), x.OfType<Class2>().Class("bar")))
+            {
+                Setters =
+                {
+                    new Setter(Class1.FooProperty, "Foo"),
+                },
+            };
+
+            var target1 = new Class1 { Classes = { "foo" } };
+            var target2 = new Class2();
+
+            StyleHelpers.TryAttach(style, target1);
+            StyleHelpers.TryAttach(style, target2);
+
+            Assert.Equal("Foo", target1.Foo);
+            Assert.Equal("foodefault", target2.Foo);
+        }
+
         private class Class1 : Control
         {
             public static readonly StyledProperty<string> FooProperty =
@@ -1063,5 +1085,22 @@ namespace Avalonia.Base.UnitTests.Styling
                 throw new NotImplementedException();
             }
         }
+
+        private class Class2 : Control
+        {
+            public static readonly StyledProperty<string> FooProperty =
+                Class1.FooProperty.AddOwner<Class2>();
+
+            public string Foo
+            {
+                get { return GetValue(FooProperty); }
+                set { SetValue(FooProperty, value); }
+            }
+
+            protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+            {
+                base.OnPropertyChanged(change);
+            }
+        }
     }
 }

From 645ca8555fc676d821f7dc06779da334e75ccd82 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@users.noreply.github.com>
Date: Fri, 15 Dec 2023 21:26:26 +0100
Subject: [PATCH 03/33] Don't override Placement when Open called in code.
 (#13967)

#6059 changed `ContextMenu.Open` to open the context menu at the bottom of the control when the `ContextRequestedEventArgs` doesn't contain a position, however it also had the side-effect of preventing the `Placement` property from being respected when opening a `ContextMenu` from code.

Change the private `Open` method to accept a `PlacementMode` instead of a boolean flag, and only pass `Bottom` here when `ContextRequestedEventArgs` has no requested position.

Fixes #12504
---
 src/Avalonia.Controls/ContextMenu.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Controls/ContextMenu.cs b/src/Avalonia.Controls/ContextMenu.cs
index b3dabd8ab9..7bfe283d40 100644
--- a/src/Avalonia.Controls/ContextMenu.cs
+++ b/src/Avalonia.Controls/ContextMenu.cs
@@ -265,7 +265,7 @@ namespace Avalonia.Controls
             }
 
             control ??= _attachedControls![0];
-            Open(control, PlacementTarget ?? control, false);
+            Open(control, PlacementTarget ?? control, Placement);
         }
 
         /// <summary>
@@ -303,7 +303,7 @@ namespace Avalonia.Controls
             remove => _popupHostChangedHandler -= value;
         }
 
-        private void Open(Control control, Control placementTarget, bool requestedByPointer)
+        private void Open(Control control, Control placementTarget, PlacementMode placement)
         {
             if (IsOpen)
             {
@@ -330,9 +330,7 @@ namespace Avalonia.Controls
                 ((ISetLogicalParent)_popup).SetParent(control);
             }
 
-            _popup.Placement = !requestedByPointer && Placement == PlacementMode.Pointer
-                ? PlacementMode.Bottom
-                : Placement;
+            _popup.Placement = placement;
 
             //Position of the line below is really important. 
             //All styles are being applied only when control has logical parent.
@@ -420,7 +418,10 @@ namespace Avalonia.Controls
                 && !contextMenu.CancelOpening())
             {
                 var requestedByPointer = e.TryGetPosition(null, out _);
-                contextMenu.Open(control, e.Source as Control ?? control, requestedByPointer);
+                contextMenu.Open(
+                    control, 
+                    e.Source as Control ?? control, 
+                    requestedByPointer ? contextMenu.Placement : PlacementMode.Bottom);
                 e.Handled = true;
             }
         }

From bfe1a7b4dc4b396ad5ca3fc8cf6d5b0cb321a72e Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Fri, 15 Dec 2023 21:35:21 +0000
Subject: [PATCH 04/33] Replace fluent menu item icon presenter with a control
 theme (#13964)

---
 .../Controls/MenuItem.xaml                    | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 3cf6261683..1052a20ee9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -81,15 +81,11 @@
                                   SharedSizeGroup="MenuItemChevron" />
               </Grid.ColumnDefinitions>
 
-              <Viewbox Name="PART_IconPresenter"
-                       Margin="{DynamicResource MenuIconPresenterMargin}"
-                       StretchDirection="DownOnly"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center"
-                       IsVisible="False"
-                       Width="16" Height="16">
-                <ContentPresenter Content="{TemplateBinding Icon}"/>
-              </Viewbox>
+              <ContentControl x:Name="PART_IconPresenter"
+                              Theme="{StaticResource FluentMenuItemIconTheme}"
+                              Content="{TemplateBinding Icon}"
+                              IsVisible="False"
+                              Margin="{DynamicResource MenuIconPresenterMargin}" />
 
               <ContentPresenter Name="PART_HeaderPresenter"
                                 Content="{TemplateBinding Header}"
@@ -143,7 +139,7 @@
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^:icon /template/ Viewbox#PART_IconPresenter">
+    <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
       <Setter Property="IsVisible" Value="True" />
     </Style>
     <Style Selector="^:selected">
@@ -210,4 +206,21 @@
     <Setter Property="Padding" Value="{DynamicResource HorizontalMenuFlyoutItemThemePaddingNarrow}" />
     <Setter Property="Margin" Value="{DynamicResource HorizontalMenuFlyoutItemMargin}" />
   </ControlTheme>
+  <ControlTheme x:Key="FluentMenuItemIconTheme"
+                TargetType="ContentControl">
+    <Setter Property="Width"
+            Value="16" />
+    <Setter Property="Height"
+            Value="16" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Viewbox
+          StretchDirection="DownOnly"
+          HorizontalAlignment="Center"
+          VerticalAlignment="Center">
+          <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" />
+        </Viewbox>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>

From db6110804f72fe16c536f62b0d5b6f2e1450e48c Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 15 Dec 2023 13:38:50 -0800
Subject: [PATCH 05/33] Fix transition leak tests (#13870)

---
 tests/Avalonia.LeakTests/TransitionTests.cs | 95 ++++++++++++++++++++-
 1 file changed, 92 insertions(+), 3 deletions(-)

diff --git a/tests/Avalonia.LeakTests/TransitionTests.cs b/tests/Avalonia.LeakTests/TransitionTests.cs
index c7add1fe11..2e68acf526 100644
--- a/tests/Avalonia.LeakTests/TransitionTests.cs
+++ b/tests/Avalonia.LeakTests/TransitionTests.cs
@@ -1,6 +1,8 @@
 using System;
 using Avalonia.Animation;
 using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Styling;
 using Avalonia.UnitTests;
 using JetBrains.dotMemoryUnit;
 using Xunit;
@@ -16,18 +18,18 @@ namespace Avalonia.LeakTests
             DotMemoryUnitTestOutput.SetOutputMethod(atr.WriteLine);
         }
 
-        [Fact(Skip = "TODO: Fix this leak")]
+        [Fact]
         public void Transition_On_StyledProperty_Is_Freed()
         {
             var clock = new MockGlobalClock();
 
-            using (UnitTestApplication.Start(new TestServices(globalClock: clock)))
+            using (UnitTestApplication.Start(TestServices.StyledWindow.With(globalClock: clock)))
             {
                 Func<Border> run = () =>
                 {
                     var border = new Border
                     {
-                        Transitions =
+                        Transitions = new Transitions()
                         {
                             new DoubleTransition
                             {
@@ -36,6 +38,9 @@ namespace Avalonia.LeakTests
                             }
                         }
                     };
+                    var window = new Window();
+                    window.Content = border;
+                    window.Show();
 
                     border.Opacity = 0;
 
@@ -47,6 +52,9 @@ namespace Avalonia.LeakTests
                     clock.Pulse(TimeSpan.FromSeconds(1));
 
                     Assert.Equal(0, border.Opacity);
+
+                    window.Close();
+
                     return border;
                 };
 
@@ -56,5 +64,86 @@ namespace Avalonia.LeakTests
                     Assert.Equal(0, memory.GetObjects(where => where.Type.Is<TransitionInstance>()).ObjectsCount));
             }
         }
+        
+        [Fact]
+        public void Shared_Transition_Collection_Is_Not_Leaking()
+        {
+            var clock = new MockGlobalClock();
+            using (UnitTestApplication.Start(TestServices.StyledWindow.With(globalClock: clock)))
+            {
+                // Our themes do share transition collections, so we need to test this scenario well.
+                var sharedTransitions = new Transitions
+                {
+                    new TransformOperationsTransition
+                    {
+                        Property = Visual.RenderTransformProperty, Duration = TimeSpan.FromSeconds(0.750)
+                    }
+                };
+                var controlTheme = new ControlTheme(typeof(Button))
+                {
+                    BasedOn = Application.Current?.Resources[typeof(Button)] as ControlTheme,
+                    Setters = { new Setter(Animatable.TransitionsProperty, sharedTransitions) }
+                };
+                
+                Func<Window> run = () =>
+                {
+                    var button = new Button() { Theme = controlTheme };
+                    var window = new Window();
+                    window.Content = button;
+                    window.Show();
+                    window.Content = null;
+                    window.Close();
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Button>()).ObjectsCount));
+            }
+        }
+
+        [Fact]
+        public void Lazily_Created_Control_Should_Not_Leak_Transitions()
+        {
+            var clock = new MockGlobalClock();
+            using (UnitTestApplication.Start(TestServices.StyledWindow.With(globalClock: clock)))
+            {
+                var sharedTransitions = new Transitions
+                {
+                    new TransformOperationsTransition
+                    {
+                        Property = Visual.RenderTransformProperty, Duration = TimeSpan.FromSeconds(0.750)
+                    }
+                };
+                var controlTheme = new ControlTheme(typeof(Button))
+                {
+                    BasedOn = Application.Current?.Resources[typeof(Button)] as ControlTheme,
+                    Setters = { new Setter(Animatable.TransitionsProperty, sharedTransitions) }
+                };
+                
+                Func<Window> run = () =>
+                {
+                    var window = new Window();
+                    window.Show();
+                    window.Content = new UserControl
+                    {
+                        Content = new Button() { Theme = controlTheme },
+                        // When invisible, Button won't be attached to the visual tree
+                        IsVisible = false
+                    };
+                    window.Content = null;
+                    window.Close();
+
+                    return window;
+                };
+
+                var result = run();
+
+                dotMemory.Check(memory =>
+                    Assert.Equal(0, memory.GetObjects(where => where.Type.Is<Button>()).ObjectsCount));
+            }
+        }
     }
 }

From 514a65e6db0e08e84d1f8d80a5d1f031daaab0b5 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Fri, 15 Dec 2023 21:39:29 +0000
Subject: [PATCH 06/33] opengl-control : dont queue update if control is not
 attached (#13938)

---
 src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
index a7a73e3f6d..ff86c79ea3 100644
--- a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -220,15 +220,15 @@ namespace Avalonia.OpenGL.Controls
 
         [Obsolete("Use RequestNextFrameRendering()"), EditorBrowsable(EditorBrowsableState.Never)]
         // ReSharper disable once MemberCanBeProtected.Global
-        public new void InvalidateVisual() => RequestNextFrameRendering(); 
-        
+        public new void InvalidateVisual() => RequestNextFrameRendering();
+
         public void RequestNextFrameRendering()
         {
             if ((_initialization == null || _initialization is { Status: TaskStatus.RanToCompletion }) &&
-                !_updateQueued)
+                !_updateQueued && _compositor != null)
             {
                 _updateQueued = true;
-                _compositor?.RequestCompositionUpdate(_update);
+                _compositor.RequestCompositionUpdate(_update);
             }
         }
 

From 63a5bcce4cb990277cbfea0908c808251b502a25 Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Sat, 16 Dec 2023 09:24:05 +0900
Subject: [PATCH 07/33] Update readme.md (#13973)

Github -> GitHub
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 9162e6638d..b92d382859 100644
--- a/readme.md
+++ b/readme.md
@@ -8,7 +8,7 @@
 
 ## 📖 About 
 
-[Avalonia](https://avaloniaui.net) is a cross-platform UI framework for dotnet, providing a flexible styling system and supporting a wide range of platforms such as Windows, macOS, Linux, iOS, Android and WebAssembly. Avalonia is mature and production ready and is used by companies, including [Schneider Electric](https://avaloniaui.net/showcase#se), [Unity](https://avaloniaui.net/showcase#unity), [JetBrains](https://avaloniaui.net/showcase#rider) and [Github](https://avaloniaui.net/showcase#github).
+[Avalonia](https://avaloniaui.net) is a cross-platform UI framework for dotnet, providing a flexible styling system and supporting a wide range of platforms such as Windows, macOS, Linux, iOS, Android and WebAssembly. Avalonia is mature and production ready and is used by companies, including [Schneider Electric](https://avaloniaui.net/showcase#se), [Unity](https://avaloniaui.net/showcase#unity), [JetBrains](https://avaloniaui.net/showcase#rider) and [GitHub](https://avaloniaui.net/showcase#github).
 
 Considered by many to be the spiritual successor to WPF, Avalonia UI provides a familiar, modern development experience for XAML developers creating cross-platform applications. While Avalonia UI is [similar to WPF](https://docs.avaloniaui.net/docs/next/get-started/wpf/), it isn't a 1:1 copy, and you'll find plenty of improvements. 
 

From 06a3727a6f7826ab03073eff014901bf6168f4ed Mon Sep 17 00:00:00 2001
From: Al <26797547+Al12rs@users.noreply.github.com>
Date: Mon, 18 Dec 2023 00:37:03 +0100
Subject: [PATCH 08/33] Fix BoxShadow style changes not triggering render
 updates (#13932)

---
 src/Avalonia.Controls/Presenters/ContentPresenter.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/ContentPresenter.cs b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
index bfe84d0960..02a8fb7d2c 100644
--- a/src/Avalonia.Controls/Presenters/ContentPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ContentPresenter.cs
@@ -169,7 +169,12 @@ namespace Avalonia.Controls.Presenters
         /// </summary>
         static ContentPresenter()
         {
-            AffectsRender<ContentPresenter>(BackgroundProperty, BorderBrushProperty, BorderThicknessProperty, CornerRadiusProperty);
+            AffectsRender<ContentPresenter>(
+                BackgroundProperty,
+                BorderBrushProperty,
+                BorderThicknessProperty,
+                CornerRadiusProperty,
+                BoxShadowProperty);
             AffectsArrange<ContentPresenter>(HorizontalContentAlignmentProperty, VerticalContentAlignmentProperty);
             AffectsMeasure<ContentPresenter>(BorderThicknessProperty, PaddingProperty);
         }

From 447b9b93fecc417198c1c67de78786c8bb659a9f Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 21 Dec 2023 12:59:09 -0800
Subject: [PATCH 09/33] Fix iOS Dispatcher (#13942)

* Replace kCFRunLoopCommonModes with kCFRunLoopDefaultMode

* Replace delegates with function pointers in iOS backend

* Update DispatcherImpl.cs
---
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj |  1 +
 src/iOS/Avalonia.iOS/DispatcherImpl.cs   | 57 ++++++++++++++----------
 src/iOS/Avalonia.iOS/Interop.cs          | 25 ++++++-----
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index 49a122b8e1..eb4938c13f 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>net7.0-ios16.0</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/iOS/Avalonia.iOS/DispatcherImpl.cs b/src/iOS/Avalonia.iOS/DispatcherImpl.cs
index 8b3c747b5a..9933126133 100644
--- a/src/iOS/Avalonia.iOS/DispatcherImpl.cs
+++ b/src/iOS/Avalonia.iOS/DispatcherImpl.cs
@@ -2,12 +2,11 @@
 
 using System;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Threading;
 using Avalonia.Threading;
 using CoreFoundation;
 using Foundation;
-using ObjCRuntime;
-using CFIndex = System.IntPtr;
 
 namespace Avalonia.iOS;
 
@@ -20,30 +19,28 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
     internal static readonly DispatcherImpl Instance = new();
 
     private readonly Stopwatch _clock = Stopwatch.StartNew();
-    private readonly Action _checkSignaledAction;
-    private readonly Action _wakeUpLoopAction;
+    private readonly object _sync = new();
     private readonly IntPtr _timer;
+    private readonly IntPtr _mainLoop;
+    private readonly IntPtr _mainQueue;
     private Thread? _loopThread;
     private bool _backgroundProcessingRequested, _signaled;
 
-    private DispatcherImpl()
+    private unsafe DispatcherImpl()
     {
-        _checkSignaledAction = CheckSignaled;
-        _wakeUpLoopAction = () =>
-        {
-            // This is needed to wakeup the loop if we are called from inside of BeforeWait hook
-        };
+        _mainLoop = Interop.CFRunLoopGetMain();
+        _mainQueue = DispatchQueue.MainQueue.Handle.Handle;
 
         var observer = Interop.CFRunLoopObserverCreate(IntPtr.Zero,
             Interop.CFOptionFlags.kCFRunLoopAfterWaiting | Interop.CFOptionFlags.kCFRunLoopBeforeSources |
             Interop.CFOptionFlags.kCFRunLoopBeforeWaiting,
-            true, 0, ObserverCallback, IntPtr.Zero);
-        Interop.CFRunLoopAddObserver(Interop.CFRunLoopGetMain(), observer, Interop.kCFRunLoopCommonModes);
+            1, 0, &ObserverCallback, IntPtr.Zero);
+        Interop.CFRunLoopAddObserver(_mainLoop, observer, Interop.kCFRunLoopDefaultMode);
 
         _timer = Interop.CFRunLoopTimerCreate(IntPtr.Zero,
             Interop.CFAbsoluteTimeGetCurrent() + DistantFutureInterval,
-            DistantFutureInterval, 0, 0, TimerCallback, IntPtr.Zero);
-        Interop.CFRunLoopAddTimer(Interop.CFRunLoopGetMain(), _timer, Interop.kCFRunLoopCommonModes);
+            DistantFutureInterval, 0, 0, &TimerCallback, IntPtr.Zero);
+        Interop.CFRunLoopAddTimer(_mainLoop, _timer, Interop.kCFRunLoopDefaultMode);
     }
 
     public event Action? Signaled;
@@ -63,16 +60,16 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
         }
     }
 
-    public void Signal()
+    public unsafe void Signal()
     {
-        lock (this)
+        lock (_sync)
         {
             if (_signaled)
                 return;
             _signaled = true;
 
-            DispatchQueue.MainQueue.DispatchAsync(_checkSignaledAction);
-            CFRunLoop.Main.WakeUp();
+            Interop.dispatch_async_f(_mainQueue, IntPtr.Zero, &CheckSignaled);
+            Interop.CFRunLoopWakeUp(_mainLoop);
         }
     }
 
@@ -86,18 +83,18 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
 
     public long Now => _clock.ElapsedMilliseconds;
 
-    public void RequestBackgroundProcessing()
+    public unsafe void RequestBackgroundProcessing()
     {
         if (_backgroundProcessingRequested)
             return;
         _backgroundProcessingRequested = true;
-        DispatchQueue.MainQueue.DispatchAsync(_wakeUpLoopAction);
+        Interop.dispatch_async_f(_mainQueue, IntPtr.Zero, &WakeUpCallback);
     }
 
     private void CheckSignaled()
     {
         bool signaled;
-        lock (this)
+        lock (_sync)
         {
             signaled = _signaled;
             _signaled = false;
@@ -109,13 +106,25 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
         }
     }
 
-    [MonoPInvokeCallback(typeof(Interop.CFRunLoopObserverCallback))]
+    [UnmanagedCallersOnly]
+    private static void CheckSignaled(IntPtr context)
+    {
+        Instance.CheckSignaled();
+    }
+
+    [UnmanagedCallersOnly]
+    private static void WakeUpCallback(IntPtr context)
+    {
+        
+    }
+
+    [UnmanagedCallersOnly]
     private static void ObserverCallback(IntPtr observer, Interop.CFOptionFlags activity, IntPtr info)
     {
         if (activity == Interop.CFOptionFlags.kCFRunLoopBeforeWaiting)
         {
             bool triggerProcessing;
-            lock (Instance)
+            lock (Instance._sync)
             {
                 triggerProcessing = Instance._backgroundProcessingRequested;
                 Instance._backgroundProcessingRequested = false;
@@ -127,7 +136,7 @@ internal class DispatcherImpl : IDispatcherImplWithExplicitBackgroundProcessing
         Instance.CheckSignaled();
     }
 
-    [MonoPInvokeCallback(typeof(Interop.CFRunLoopTimerCallback))]
+    [UnmanagedCallersOnly]
     private static void TimerCallback(IntPtr timer, IntPtr info)
     {
         Instance.Timer?.Invoke();
diff --git a/src/iOS/Avalonia.iOS/Interop.cs b/src/iOS/Avalonia.iOS/Interop.cs
index c0b3506936..b05ddafc9a 100644
--- a/src/iOS/Avalonia.iOS/Interop.cs
+++ b/src/iOS/Avalonia.iOS/Interop.cs
@@ -7,11 +7,11 @@ using ObjCRuntime;
 
 namespace Avalonia.iOS;
 
-// TODO: use LibraryImport in NET7
-internal class Interop
+internal unsafe class Interop
 {
     internal const string CoreFoundationLibrary = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
-    internal static NativeHandle kCFRunLoopCommonModes = CFString.CreateNative("kCFRunLoopCommonModes");
+    internal const string libcLibrary = "/usr/lib/libc.dylib";
+    internal static NativeHandle kCFRunLoopDefaultMode = CFString.CreateNative("kCFRunLoopDefaultMode");
 
     [Flags]
     internal enum CFOptionFlags : ulong
@@ -20,26 +20,29 @@ internal class Interop
         kCFRunLoopAfterWaiting = (1UL << 6),
         kCFRunLoopBeforeWaiting = (1UL << 5)
     }
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void CFRunLoopObserverCallback(IntPtr observer, CFOptionFlags activity, IntPtr info);
-
-    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-    internal delegate void CFRunLoopTimerCallback(IntPtr timer, IntPtr info);
     
+    [DllImport(libcLibrary)]
+    internal static extern void dispatch_async_f(IntPtr queue, IntPtr context, delegate* unmanaged<IntPtr, void> dispatch);
+
     [DllImport(CoreFoundationLibrary)]
     internal static extern IntPtr CFRunLoopGetMain();
+    
+    [DllImport(CoreFoundationLibrary)]
+    internal static extern IntPtr CFRunLoopGetCurrent();
 
+    [DllImport (CoreFoundationLibrary)]
+    internal static extern void CFRunLoopWakeUp(IntPtr rl);
+    
     [DllImport(CoreFoundationLibrary)]
     internal static extern IntPtr CFRunLoopObserverCreate(IntPtr allocator, CFOptionFlags activities,
-        bool repeats, int index, CFRunLoopObserverCallback callout, IntPtr context);
+        int repeats, int index, delegate* unmanaged<IntPtr, CFOptionFlags, IntPtr, void> callout, IntPtr context);
 
     [DllImport(CoreFoundationLibrary)]
     internal static extern IntPtr CFRunLoopAddObserver(IntPtr loop, IntPtr observer, IntPtr mode);
 
     [DllImport(CoreFoundationLibrary)]
     internal static extern IntPtr CFRunLoopTimerCreate(IntPtr allocator, double firstDate, double interval,
-        CFOptionFlags flags, int order, CFRunLoopTimerCallback callout, IntPtr context);
+        CFOptionFlags flags, int order, delegate* unmanaged<IntPtr, IntPtr, void> callout, IntPtr context);
 
     [DllImport(CoreFoundationLibrary)]
     internal static extern void CFRunLoopTimerSetTolerance(IntPtr timer, double tolerance);

From 960db26b645fc5083438c992b0352a293951491b Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Fri, 22 Dec 2023 00:40:54 +0100
Subject: [PATCH 10/33] fix: removed assigned but never used variable (#13995)

---
 src/Avalonia.Native/WindowImplBase.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 93d63160ea..e7366b76c1 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -10,10 +10,8 @@ using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Input.Raw;
 using Avalonia.Native.Interop;
-using Avalonia.OpenGL;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
-using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
 
@@ -58,7 +56,6 @@ namespace Avalonia.Native
         private readonly IKeyboardDevice _keyboard;
         private readonly ICursorFactory _cursorFactory;
         private Size _savedLogicalSize;
-        private Size _lastRenderedLogicalSize;
         private double _savedScaling;
         private NativeControlHostImpl _nativeControlHost;
         private IStorageProvider _storageProvider;
@@ -172,7 +169,6 @@ namespace Avalonia.Native
                         if (_parent._native != null && _target != null)
                         {
                             cb(_parent._native);
-                            _parent._lastRenderedLogicalSize = _parent._savedLogicalSize;
                         }
                     }
                 }, (int)w, (int)h, new Vector(dpi, dpi));

From 8756feff5d0fca8c96acd5a2a2fde65e52f86087 Mon Sep 17 00:00:00 2001
From: affederaffe <68356204+affederaffe@users.noreply.github.com>
Date: Fri, 22 Dec 2023 07:11:57 +0100
Subject: [PATCH 11/33] Fix DBus Exception on window close (#13997)

* Only disconnect from ibus when connected

* Catch exception on Destroy when ime context is successfully created but doesn't actually exist
---
 .../DBusIme/DBusTextInputMethodBase.cs            | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
index 6cd24c49eb..158321acf5 100644
--- a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
+++ b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -179,12 +179,23 @@ namespace Avalonia.FreeDesktop.DBusIme
                 _disposables.Add(d);
         }
 
-        public void Dispose()
+        public async void Dispose()
         {
             foreach(var d in _disposables)
                 d.Dispose();
             _disposables.Clear();
-            _ = DisconnectAsync();
+            if (!IsConnected)
+                return;
+            try
+            {
+                await DisconnectAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.TryGet(LogEventLevel.Error, "IME")
+                    ?.Log(this, "Error while destroying the context:\n" + ex);
+            }
+
             _currentName = null;
         }
 

From 7e81b5d8c2d873df5333950e12847ad3a9a8371d Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Fri, 22 Dec 2023 07:54:36 +0100
Subject: [PATCH 12/33] Fix SelectedItemsControl initialization property order
 (#13800)

* Add SelectingItemsControl property init order tests

* Property order in SelectedItemsControl doesn't matter on init

* Fix SelectedItemsControl properties during init when Selection is set

* Fixed SelectedItemsControl.AnchorIndex after init
---
 .../Primitives/SelectingItemsControl.cs       | 115 +++++------
 .../EnumerableExtensions.cs                   |  26 ++-
 .../Primitives/SelectingItemsControlTests.cs  | 189 +++++++++++++++++-
 tests/Avalonia.UnitTests/NotifyingBase.cs     |  19 +-
 4 files changed, 282 insertions(+), 67 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
index beec0bdcb1..e20e928f8d 100644
--- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
+++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
@@ -8,7 +7,6 @@ using System.Linq;
 using Avalonia.Controls.Selection;
 using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Metadata;
 using Avalonia.Threading;
@@ -187,14 +185,21 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public int SelectedIndex
         {
-            get =>
+            get
+            {
                 // When a Begin/EndInit/DataContext update is in place we return the value to be
                 // updated here, even though it's not yet active and the property changed notification
                 // has not yet been raised. If we don't do this then the old value will be written back
                 // to the source when two-way bound, and the update value will be lost.
-                _updateState?.SelectedIndex.HasValue == true ?
-                    _updateState.SelectedIndex.Value :
-                    Selection.SelectedIndex;
+                if (_updateState is not null)
+                {
+                    return _updateState.SelectedIndex.HasValue ?
+                        _updateState.SelectedIndex.Value :
+                        TryGetExistingSelection()?.SelectedIndex ?? -1;
+                }
+
+                return Selection.SelectedIndex;
+            }
             set
             {
                 if (_updateState is object)
@@ -213,11 +218,18 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         public object? SelectedItem
         {
-            get =>
-                // See SelectedIndex setter for more information.
-                _updateState?.SelectedItem.HasValue == true ?
-                    _updateState.SelectedItem.Value :
-                    Selection.SelectedItem;
+            get
+            {
+                // See SelectedIndex getter for more information.
+                if (_updateState is not null)
+                {
+                    return _updateState.SelectedItem.HasValue ?
+                        _updateState.SelectedItem.Value :
+                        TryGetExistingSelection()?.SelectedItem;
+                }
+
+                return Selection.SelectedItem;
+            }
             set
             {
                 if (_updateState is object)
@@ -270,6 +282,7 @@ namespace Avalonia.Controls.Primitives
                 {
                     return _updateState.SelectedItems.Value;
                 }
+
                 else if (Selection is InternalSelectionModel ism)
                 {
                     var result = ism.WritableSelectedItems;
@@ -456,10 +469,8 @@ namespace Avalonia.Controls.Primitives
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
-            if (Selection?.AnchorIndex is int index)
-            {
-                AutoScrollToSelectedItemIfNecessary(index);
-            }
+
+            AutoScrollToSelectedItemIfNecessary(GetAnchorIndex());
         }
 
         /// <inheritdoc />
@@ -470,10 +481,8 @@ namespace Avalonia.Controls.Primitives
             void ExecuteScrollWhenLayoutUpdated(object? sender, EventArgs e)
             {
                 LayoutUpdated -= ExecuteScrollWhenLayoutUpdated;
-                if (Selection?.AnchorIndex is int index)
-                {
-                    AutoScrollToSelectedItemIfNecessary(index);
-                }
+
+                AutoScrollToSelectedItemIfNecessary(GetAnchorIndex());
             }
 
             if (AutoScrollToSelectedItem)
@@ -482,6 +491,15 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
+        internal int GetAnchorIndex()
+        {
+            var selection = _updateState is not null ? TryGetExistingSelection() : Selection;
+            return selection?.AnchorIndex ?? -1;
+        }
+
+        private ISelectionModel? TryGetExistingSelection()
+            => _updateState?.Selection.HasValue == true ? _updateState.Selection.Value : _selection;
+
         protected internal override void PrepareContainerForItemOverride(Control container, object? item, int index)
         {
             // Ensure that the selection model is created at this point so that accessing it in 
@@ -634,10 +652,7 @@ namespace Avalonia.Controls.Primitives
 
             if (change.Property == AutoScrollToSelectedItemProperty)
             {
-                if (Selection?.AnchorIndex is int index)
-                {
-                    AutoScrollToSelectedItemIfNecessary(index);
-                }
+                AutoScrollToSelectedItemIfNecessary(GetAnchorIndex());
             }
             else if (change.Property == SelectionModeProperty && _selection is object)
             {
@@ -671,7 +686,7 @@ namespace Avalonia.Controls.Primitives
                     return;
                 }
 
-                var value = change.GetNewValue<IBinding>();
+                var value = change.GetNewValue<IBinding?>();
                 if (value is null)
                 {
                     // Clearing SelectedValueBinding makes the SelectedValue the item itself
@@ -921,11 +936,10 @@ namespace Avalonia.Controls.Primitives
             if (e.PropertyName == nameof(ISelectionModel.AnchorIndex))
             {
                 _hasScrolledToSelectedItem = false;
-                if (Selection?.AnchorIndex is int index)
-                {
-                    KeyboardNavigation.SetTabOnceActiveElement(this, ContainerFromIndex(index));
-                    AutoScrollToSelectedItemIfNecessary(index);
-                }
+
+                var anchorIndex = GetAnchorIndex();
+                KeyboardNavigation.SetTabOnceActiveElement(this, ContainerFromIndex(anchorIndex));
+                AutoScrollToSelectedItemIfNecessary(anchorIndex);
             }
             else if (e.PropertyName == nameof(ISelectionModel.SelectedIndex) && _oldSelectedIndex != SelectedIndex)
             {
@@ -1279,9 +1293,17 @@ namespace Avalonia.Controls.Primitives
                         state.SelectedItem = item;
                 }
 
+                // SelectedIndex vs SelectedItem:
+                // - If only one has a value, use it
+                // - If both have a value, prefer the one having a "non-empty" value, e.g. not -1 nor null
+                // - If both have a "non-empty" value, prefer the index
                 if (state.SelectedIndex.HasValue)
                 {
-                    SelectedIndex = state.SelectedIndex.Value;
+                    var selectedIndex = state.SelectedIndex.Value;
+                    if (selectedIndex >= 0 || !state.SelectedItem.HasValue)
+                        SelectedIndex = selectedIndex;
+                    else
+                        SelectedItem = state.SelectedItem.Value;
                 }
                 else if (state.SelectedItem.HasValue)
                 {
@@ -1338,39 +1360,12 @@ namespace Avalonia.Controls.Primitives
         // - Both the old and new SelectionModels have the incorrect Source
         private class UpdateState
         {
-            private Optional<int> _selectedIndex;
-            private Optional<object?> _selectedItem;
-            private Optional<object?> _selectedValue;
-
             public int UpdateCount { get; set; }
             public Optional<ISelectionModel> Selection { get; set; }
             public Optional<IList?> SelectedItems { get; set; }
-
-            public Optional<int> SelectedIndex
-            {
-                get => _selectedIndex;
-                set
-                {
-                    _selectedIndex = value;
-                    _selectedItem = default;
-                }
-            }
-
-            public Optional<object?> SelectedItem
-            {
-                get => _selectedItem;
-                set
-                {
-                    _selectedItem = value;
-                    _selectedIndex = default;
-                }
-            }
-
-            public Optional<object?> SelectedValue
-            {
-                get => _selectedValue;
-                set => _selectedValue = value;
-            }
+            public Optional<int> SelectedIndex { get; set; }
+            public Optional<object?> SelectedItem { get; set; }
+            public Optional<object?> SelectedValue { get; set; }
         }
 
         /// <summary>
diff --git a/tests/Avalonia.Controls.UnitTests/EnumerableExtensions.cs b/tests/Avalonia.Controls.UnitTests/EnumerableExtensions.cs
index a2d752ab39..25bf3d3c4e 100644
--- a/tests/Avalonia.Controls.UnitTests/EnumerableExtensions.cs
+++ b/tests/Avalonia.Controls.UnitTests/EnumerableExtensions.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -16,5 +14,29 @@ namespace Avalonia.Controls.UnitTests
                 yield return i;
             }
         }
+
+        public static IEnumerable<T[]> Permutations<T>(this IEnumerable<T> source)
+        {
+            var sourceArray = source.ToArray();
+            var results = new List<T[]>();
+            Permute(sourceArray, 0, sourceArray.Length - 1);
+            return results;
+
+            void Permute(T[] elements, int depth, int maxDepth)
+            {
+                if (depth == maxDepth)
+                {
+                    results.Add(elements.ToArray());
+                    return;
+                }
+
+                for (var i = depth; i <= maxDepth; i++)
+                {
+                    (elements[depth], elements[i]) = (elements[i], elements[depth]);
+                    Permute(elements, depth + 1, maxDepth);
+                    (elements[depth], elements[i]) = (elements[i], elements[depth]);
+                }
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index aa2b7ca531..8c8bf2b33f 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -5,7 +5,6 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
-using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
@@ -18,7 +17,6 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Markup.Data;
-using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
@@ -2294,6 +2292,134 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
         }
 
+        [Theory]
+        [MemberData(nameof(GetSelectionFieldPermutationParameters))]
+        public void SelectedItem_And_Selection_Properties_Work_In_Any_Order_When_Initializing(SelectionField[] fields)
+            => TestSelectionFields(vm => vm.SelectedItem = vm.Items[2], fields);
+
+        [Theory]
+        [MemberData(nameof(GetSelectionFieldPermutationParameters))]
+        public void SelectedIndex_And_Selection_Properties_Work_In_Any_Order_When_Initializing(SelectionField[] fields)
+            => TestSelectionFields(vm => vm.SelectedIndex = 2, fields);
+
+        [Theory]
+        [MemberData(nameof(GetSelectionFieldPermutationParameters))]
+        public void SelectedValue_And_Selection_Properties_Work_In_Any_Order_When_Initializing(SelectionField[] fields)
+            => TestSelectionFields(vm => vm.SelectedValue = 12, fields);
+
+        private void TestSelectionFields(Action<FullSelectionViewModel> setItem2, SelectionField[] fields)
+        {
+            using var _ = Start();
+
+            var vm = new FullSelectionViewModel
+            {
+                Items =
+                {
+                    new ItemModel { Id = 10, Name = "Item0" },
+                    new ItemModel { Id = 11, Name = "Item1" },
+                    new ItemModel { Id = 12, Name = "Item2" },
+                    new ItemModel { Id = 13, Name = "Item3" }
+                }
+            };
+
+            setItem2(vm);
+
+            var root = new TestRoot
+            {
+                Width = 100,
+                Height = 100
+            };
+
+            // Match the Begin/EndInit sequence emitted by the XAML compiler
+            root.BeginInit();
+            var target = new ListBox();
+            target.BeginInit();
+            root.Child = target;
+            target.DataContext = vm;
+
+            foreach (var field in fields)
+            {
+                switch (field)
+                {
+                    case SelectionField.ItemsSource:
+                        target.Bind(ItemsControl.ItemsSourceProperty, new Binding(nameof(FullSelectionViewModel.Items)));
+                        break;
+                    case SelectionField.SelectedItem:
+                        target.Bind(SelectingItemsControl.SelectedItemProperty, new Binding(nameof(FullSelectionViewModel.SelectedItem)));
+                        break;
+                    case SelectionField.SelectedIndex:
+                        target.Bind(SelectingItemsControl.SelectedIndexProperty, new Binding(nameof(FullSelectionViewModel.SelectedIndex)));
+                        break;
+                    case SelectionField.SelectedValue:
+                        target.Bind(SelectingItemsControl.SelectedValueProperty, new Binding(nameof(FullSelectionViewModel.SelectedValue)));
+                        break;
+                    case SelectionField.SelectedValueBinding:
+                        target.SelectedValueBinding = new Binding(nameof(ItemModel.Id));
+                        break;
+                    default:
+                        throw new InvalidOperationException($"Unkown field {field}");
+                }
+            }
+
+            target.EndInit();
+            root.EndInit();
+
+            Assert.Equal(vm.Items[2], target.SelectedItem);
+            Assert.Equal(2, target.SelectedIndex);
+            Assert.Equal(12, target.SelectedValue);
+
+            Assert.Equal(vm.Items[2], vm.SelectedItem);
+            Assert.Equal(2, vm.SelectedIndex);
+            Assert.Equal(12, vm.SelectedValue);
+        }
+
+        [Fact]
+        public void SelectedItem_Can_Access_Selection_DuringInit()
+        {
+            using var _ = Start();
+
+            var target = new ListBox();
+            target.BeginInit();
+
+            var item = new ItemModel();
+
+            target.Selection = new SelectionModel<ItemModel> {
+                SelectedItem = item
+            };
+
+            Assert.Equal(item, target.SelectedItem);
+        }
+
+        [Fact]
+        public void SelectedIndex_Can_Access_Selection_DuringInit()
+        {
+            using var _ = Start();
+
+            var target = new ListBox();
+            target.BeginInit();
+
+            target.Selection = new SelectionModel<ItemModel> {
+                SelectedIndex = 42
+            };
+
+            Assert.Equal(42, target.SelectedIndex);
+        }
+
+        [Fact]
+        public void AnchorIndex_Can_Access_Selection_DuringInit()
+        {
+            using var _ = Start();
+
+            var target = new ListBox();
+            target.BeginInit();
+
+            target.Selection = new SelectionModel<ItemModel> {
+                AnchorIndex = 42
+            };
+
+            Assert.Equal(42, target.GetAnchorIndex());
+        }
+
         private static IDisposable Start()
         {
             return UnitTestApplication.Start(TestServices.StyledWindow);
@@ -2336,6 +2462,9 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 }.RegisterInNameScope(scope));
         }
 
+        public static IEnumerable<object[]> GetSelectionFieldPermutationParameters()
+            => Enum.GetValues<SelectionField>().Permutations().Select(fields => new object[] { fields });
+
         private class Item : Control, ISelectable
         {
             public string Value { get; set; }
@@ -2467,5 +2596,61 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             public event NotifyCollectionChangedEventHandler CollectionChanged;
         }
+
+#nullable enable
+
+        private sealed class FullSelectionViewModel : NotifyingBase
+        {
+            private ItemModel? _selectedItem;
+            private int _selectedIndex = -1;
+            private int? _selectedValue;
+
+            public ObservableCollection<ItemModel> Items { get; } = new();
+
+            public ItemModel? SelectedItem
+            {
+                get => _selectedItem;
+                set => SetField(ref _selectedItem, value);
+            }
+
+            public int SelectedIndex
+            {
+                get => _selectedIndex;
+                set => SetField(ref _selectedIndex, value);
+            }
+
+            public int? SelectedValue
+            {
+                get => _selectedValue;
+                set => SetField(ref _selectedValue, value);
+            }
+        }
+
+        private sealed class ItemModel : NotifyingBase
+        {
+            private int _id;
+            private string? _name;
+
+            public int Id
+            {
+                get => _id;
+                set => SetField(ref _id, value);
+            }
+
+            public string? Name
+            {
+                get => _name;
+                set => SetField(ref _name, value);
+            }
+        }
+
+        public enum SelectionField
+        {
+            ItemsSource,
+            SelectedItem,
+            SelectedIndex,
+            SelectedValue,
+            SelectedValueBinding
+        }
     }
 }
diff --git a/tests/Avalonia.UnitTests/NotifyingBase.cs b/tests/Avalonia.UnitTests/NotifyingBase.cs
index 9542e023d5..3989118b79 100644
--- a/tests/Avalonia.UnitTests/NotifyingBase.cs
+++ b/tests/Avalonia.UnitTests/NotifyingBase.cs
@@ -1,3 +1,6 @@
+#nullable enable
+
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -6,9 +9,9 @@ namespace Avalonia.UnitTests
 {
     public class NotifyingBase : INotifyPropertyChanged
     {
-        private PropertyChangedEventHandler _propertyChanged;
+        private PropertyChangedEventHandler? _propertyChanged;
 
-        public event PropertyChangedEventHandler PropertyChanged
+        public event PropertyChangedEventHandler? PropertyChanged
         {
             add
             {
@@ -32,9 +35,19 @@ namespace Avalonia.UnitTests
             private set;
         }
 
-        public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+        public void RaisePropertyChanged([CallerMemberName] string? propertyName = null)
         {
             _propertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value))
+                return false;
+
+            field = value;
+            RaisePropertyChanged(propertyName);
+            return true;
+        }
     }
 }

From 10b203b14b62e2092d589e85800abfc2421719b4 Mon Sep 17 00:00:00 2001
From: sghctoma <sghctoma@gmail.com>
Date: Fri, 22 Dec 2023 10:38:26 +0100
Subject: [PATCH 13/33] Fix IOSStorageFolder permission problem (#13976)

* Fix IOSStorageFolder permission problem

This commit fixes "Operation not permitted" errors when accessing
folders opened via StorageProvider.OpenFolderPickerAsync by calling
[Start/Stop]AccessingSecurityScopedResource on IOSStorageFolder's
Url.

* Narrow down security scoped resource access scope

Wrap individual operations in [Start/Stop]AccessingSecurityScopedResource
calls instead of retaining access for the whole lifetime of the folder.
---
 .../Storage/IOSSecurityScopedStream.cs        |   8 +-
 .../Avalonia.iOS/Storage/IOSStorageItem.cs    | 188 ++++++++++++------
 2 files changed, 128 insertions(+), 68 deletions(-)

diff --git a/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs b/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs
index 8349258c98..424ec7589a 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSSecurityScopedStream.cs
@@ -13,13 +13,15 @@ internal sealed class IOSSecurityScopedStream : Stream
     private readonly UIDocument _document;
     private readonly FileStream _stream;
     private readonly NSUrl _url;
+    private readonly NSUrl _securityScopedAncestorUrl;
 
-    internal IOSSecurityScopedStream(NSUrl url, FileAccess access)
+    internal IOSSecurityScopedStream(NSUrl url, NSUrl securityScopedAncestorUrl, FileAccess access)
     {
         _document = new UIDocument(url);
         var path = _document.FileUrl.Path!;
         _url = url;
-        _url.StartAccessingSecurityScopedResource();
+        _securityScopedAncestorUrl = securityScopedAncestorUrl;
+        _securityScopedAncestorUrl.StartAccessingSecurityScopedResource();
         _stream = File.Open(path, FileMode.Open, access);
     }
 
@@ -60,7 +62,7 @@ internal sealed class IOSSecurityScopedStream : Stream
         {
             _stream.Dispose();
             _document.Dispose();
-            _url.StopAccessingSecurityScopedResource();
+            _securityScopedAncestorUrl.StopAccessingSecurityScopedResource();
         }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
index 09fd6e88ec..f6697777be 100644
--- a/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
+++ b/src/iOS/Avalonia.iOS/Storage/IOSStorageItem.cs
@@ -17,9 +17,10 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
 {
     private readonly string _filePath;
 
-    protected IOSStorageItem(NSUrl url)
+    protected IOSStorageItem(NSUrl url, NSUrl? securityScopedAncestorUrl = null)
     {
         Url = url ?? throw new ArgumentNullException(nameof(url));
+        SecurityScopedAncestorUrl = securityScopedAncestorUrl ?? url;
 
         using (var doc = new UIDocument(url))
         {
@@ -32,6 +33,11 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
     }
 
     internal NSUrl Url { get; }
+    // Calling StartAccessingSecurityScopedResource on items retrieved from, or created in a folder
+    // fails, because only folders directly opened via StorageProvider.OpenFolderPickerAsync have
+    // security-scoped NSUrls. This property stores and exposes that ancestor's Url, so we can have
+    // recursive access to an opened folder.
+    internal NSUrl SecurityScopedAncestorUrl { get; }
     internal string FilePath => _filePath;
 
     public bool CanBookmark => true;
@@ -57,39 +63,59 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
 
     public Task<IStorageFolder?> GetParentAsync()
     {
-        return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(Url.RemoveLastPathComponent()));
+        return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(Url.RemoveLastPathComponent(), SecurityScopedAncestorUrl));
     }
 
     public Task DeleteAsync()
     {
-        return NSFileManager.DefaultManager.Remove(Url, out var error)
-            ? Task.CompletedTask
-            : Task.FromException(new NSErrorException(error));
+        try
+        {
+            SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource();
+
+            return NSFileManager.DefaultManager.Remove(Url, out var error)
+                ? Task.CompletedTask
+                : Task.FromException(new NSErrorException(error));
+        }
+        finally
+        {
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
+        }
     }
 
-    public Task<IStorageItem?> MoveAsync(IStorageFolder destination)
+    public async Task<IStorageItem?> MoveAsync(IStorageFolder destination)
     {
         if (destination is not IOSStorageFolder folder)
         {
             throw new InvalidOperationException("Destination folder must be initialized the StorageProvider API.");
         }
 
-        var isDir = this is IStorageFolder;
-        var newPath = new NSUrl(System.IO.Path.Combine(folder.FilePath, Name), isDir);
-
-        if (NSFileManager.DefaultManager.Move(folder.Url, newPath, out var error))
+        try
         {
-            return isDir
-                ? Task.FromResult<IStorageItem?>(new IOSStorageFolder(newPath))
-                : Task.FromResult<IStorageItem?>(new IOSStorageFile(newPath));
-        }
+            SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource();
+            folder.SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource();
 
-        if (error is not null)
+            var isDir = this is IStorageFolder;
+            var newPath = new NSUrl(System.IO.Path.Combine(folder.FilePath, Name), isDir);
+
+            if (NSFileManager.DefaultManager.Move(Url, newPath, out var error))
+            {
+                return isDir
+                    ? new IOSStorageFolder(newPath)
+                    : new IOSStorageFile(newPath);
+            }
+
+            if (error is not null)
+            {
+                throw new NSErrorException(error);
+            }
+
+            return null;
+        }
+        finally
         {
-            throw new NSErrorException(error);
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
+            folder.SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
         }
-
-        return Task.FromResult<IStorageItem?>(null);
     }
 
     public Task ReleaseBookmarkAsync()
@@ -102,7 +128,7 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
     {
         try
         {
-            if (!Url.StartAccessingSecurityScopedResource())
+            if (!SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource())
             {
                 return Task.FromResult<string?>(null);
             }
@@ -120,7 +146,7 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
         }
         finally
         {
-            Url.StopAccessingSecurityScopedResource();
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
         }
     }
 
@@ -131,89 +157,121 @@ internal abstract class IOSStorageItem : IStorageBookmarkItem
 
 internal sealed class IOSStorageFile : IOSStorageItem, IStorageBookmarkFile
 {
-    public IOSStorageFile(NSUrl url) : base(url)
+    public IOSStorageFile(NSUrl url, NSUrl? securityScopedAncestorUrl = null) : base(url, securityScopedAncestorUrl)
     {
     }
     
     public Task<Stream> OpenReadAsync()
     {
-        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Read));
+        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, SecurityScopedAncestorUrl, FileAccess.Read));
     }
 
     public Task<Stream> OpenWriteAsync()
     {
-        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, FileAccess.Write));
+        return Task.FromResult<Stream>(new IOSSecurityScopedStream(Url, SecurityScopedAncestorUrl, FileAccess.Write));
     }
 }
 
 internal sealed class IOSStorageFolder : IOSStorageItem, IStorageBookmarkFolder
 {
-    public IOSStorageFolder(NSUrl url) : base(url)
+    public IOSStorageFolder(NSUrl url, NSUrl? securityScopedAncestorUrl = null) : base(url, securityScopedAncestorUrl)
     {
     }
 
     public async IAsyncEnumerable<IStorageItem> GetItemsAsync()
     {
-        // TODO: find out if it can be lazily enumerated.
-        var tcs = new TaskCompletionSource<IReadOnlyList<IStorageItem>>();
+        try
+        {
+            SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource();
 
-        new NSFileCoordinator().CoordinateRead(Url,
-            NSFileCoordinatorReadingOptions.WithoutChanges,
-            out var error,
-            uri =>
-            {
-                var content = NSFileManager.DefaultManager.GetDirectoryContent(uri, null, NSDirectoryEnumerationOptions.None, out var error);
-                if (error is not null)
-                {
-                    tcs.TrySetException(new NSErrorException(error));
-                }
-                else
+            // TODO: find out if it can be lazily enumerated.
+            var tcs = new TaskCompletionSource<IReadOnlyList<IStorageItem>>();
+
+            new NSFileCoordinator().CoordinateRead(Url,
+                NSFileCoordinatorReadingOptions.WithoutChanges,
+                out var error,
+                uri =>
                 {
-                    var items = content
-                        .Select(u => u.HasDirectoryPath ? (IStorageItem)new IOSStorageFolder(u) : new IOSStorageFile(u))
-                        .ToArray();
-                    tcs.TrySetResult(items);
-                }
-            });
+                    var content = NSFileManager.DefaultManager.GetDirectoryContent(uri, null, NSDirectoryEnumerationOptions.None, out var error);
+                    if (error is not null)
+                    {
+                        tcs.TrySetException(new NSErrorException(error));
+                    }
+                    else
+                    {
+                        var items = content
+                            .Select(u => u.HasDirectoryPath ?
+                                (IStorageItem)new IOSStorageFolder(u, SecurityScopedAncestorUrl) :
+                                new IOSStorageFile(u, SecurityScopedAncestorUrl))
+                            .ToArray();
+                        tcs.TrySetResult(items);
+                    }
+                });
         
-        if (error is not null)
-        {
-            throw new NSErrorException(error);
-        }
+            if (error is not null)
+            {
+                throw new NSErrorException(error);
+            }
 
-        var items = await tcs.Task;
-        foreach (var item in items)
+            var items = await tcs.Task;
+            foreach (var item in items)
+            {
+                yield return item;
+            }
+        }
+        finally
         {
-            yield return item;
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
         }
     }
 
     public Task<IStorageFile?> CreateFileAsync(string name)
     {
-        var path = System.IO.Path.Combine(FilePath, name);
-        NSFileAttributes? attributes = null;
-        if (NSFileManager.DefaultManager.CreateFile(path, null, attributes))
+        try
         {
-            return Task.FromResult<IStorageFile?>(new IOSStorageFile(new NSUrl(path, false)));
-        }
+            if (!SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource())
+            {
+                return Task.FromResult<IStorageFile?>(null);
+            }
 
-        return Task.FromResult<IStorageFile?>(null);
+            var path = System.IO.Path.Combine(FilePath, name);
+            NSFileAttributes? attributes = null;
+            if (NSFileManager.DefaultManager.CreateFile(path, new NSData(), attributes))
+            {
+                return Task.FromResult<IStorageFile?>(new IOSStorageFile(new NSUrl(path, false), SecurityScopedAncestorUrl));
+            }
+
+            return Task.FromResult<IStorageFile?>(null);
+        }
+        finally
+        {
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
+        }
     }
 
     public Task<IStorageFolder?> CreateFolderAsync(string name)
     {
-        var path = System.IO.Path.Combine(FilePath, name);
-        NSFileAttributes? attributes = null;
-        if (NSFileManager.DefaultManager.CreateDirectory(path, false, attributes, out var error))
+        try
         {
-            return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(new NSUrl(path, true)));
-        }
+            SecurityScopedAncestorUrl.StartAccessingSecurityScopedResource();
 
-        if (error is not null)
+            var path = System.IO.Path.Combine(FilePath, name);
+            NSFileAttributes? attributes = null;
+            if (NSFileManager.DefaultManager.CreateDirectory(path, false, attributes, out var error))
+            {
+                return Task.FromResult<IStorageFolder?>(new IOSStorageFolder(new NSUrl(path, true), SecurityScopedAncestorUrl));
+            }
+
+            if (error is not null)
+            {
+                throw new NSErrorException(error);
+            }
+
+            return Task.FromResult<IStorageFolder?>(null);
+        }
+        finally
         {
-            throw new NSErrorException(error);
+            SecurityScopedAncestorUrl.StopAccessingSecurityScopedResource();
         }
-        
-        return Task.FromResult<IStorageFolder?>(null);
     }
 }

From 02ddfad24582fc8ad439071a5551ff96e3bbb8fe Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 22 Dec 2023 01:44:07 -0800
Subject: [PATCH 14/33] Implement helper OutputApiDiff target (#13818)

---
 .gitignore                                    |   1 +
 .nuke/build.schema.json                       |   2 +
 Avalonia.sln                                  |  13 ++
 ...{ApiDiffValidation.cs => ApiDiffHelper.cs} | 150 +++++++++++++++---
 nukebuild/Build.cs                            |  16 +-
 nukebuild/_build.csproj                       |   3 +
 6 files changed, 160 insertions(+), 25 deletions(-)
 rename nukebuild/{ApiDiffValidation.cs => ApiDiffHelper.cs} (54%)

diff --git a/.gitignore b/.gitignore
index ee778ed4e2..ddbe436d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,3 +217,4 @@ node_modules
 src/Browser/Avalonia.Browser.Blazor/webapp/package-lock.json
 src/Browser/Avalonia.Browser.Blazor/wwwroot
 src/Browser/Avalonia.Browser/wwwroot
+api/diff
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
index b802589fc7..a21636409b 100644
--- a/.nuke/build.schema.json
+++ b/.nuke/build.schema.json
@@ -83,6 +83,7 @@
               "CreateIntermediateNugetPackages",
               "CreateNugetPackages",
               "GenerateCppHeaders",
+              "OutputApiDiff",
               "Package",
               "RunCoreLibsTests",
               "RunHtmlPreviewerTests",
@@ -117,6 +118,7 @@
               "CreateIntermediateNugetPackages",
               "CreateNugetPackages",
               "GenerateCppHeaders",
+              "OutputApiDiff",
               "Package",
               "RunCoreLibsTests",
               "RunHtmlPreviewerTests",
diff --git a/Avalonia.sln b/Avalonia.sln
index 22ac15e6ee..9c78c109a5 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -236,6 +236,19 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{176582E8-46AF-416A-85C1-13A5C6744497}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		azure-pipelines.yml = azure-pipelines.yml
+		azure-pipelines-integrationtests.yml = azure-pipelines-integrationtests.yml
+		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
+		CONTRIBUTING.md = CONTRIBUTING.md
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		dirs.proj = dirs.proj
+		global.json = global.json
+		licence.md = licence.md
+		NOTICE.md = NOTICE.md
+		NuGet.Config = NuGet.Config
+		readme.md = readme.md
+		Settings.StyleCop = Settings.StyleCop
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ItemsRepeater", "src\Avalonia.Controls.ItemsRepeater\Avalonia.Controls.ItemsRepeater.csproj", "{EE0F0DD4-A70D-472B-BD5D-B7D32D0E9386}"
diff --git a/nukebuild/ApiDiffValidation.cs b/nukebuild/ApiDiffHelper.cs
similarity index 54%
rename from nukebuild/ApiDiffValidation.cs
rename to nukebuild/ApiDiffHelper.cs
index 3c58215d26..946477d287 100644
--- a/nukebuild/ApiDiffValidation.cs
+++ b/nukebuild/ApiDiffHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -10,9 +11,95 @@ using System.Threading.Tasks;
 using Nuke.Common.Tooling;
 using static Serilog.Log;
 
-public static class ApiDiffValidation
+public static class ApiDiffHelper
 {
-    private static readonly HttpClient s_httpClient = new();
+    static readonly HttpClient s_httpClient = new();
+
+    public static async Task GetDiff(
+        Tool apiDiffTool, string outputFolder,
+        string packagePath, string baselineVersion)
+    {
+        await using var baselineStream = await DownloadBaselinePackage(packagePath, baselineVersion);
+        if (baselineStream == null)
+            return;
+
+        if (!Directory.Exists(outputFolder))
+        {
+            Directory.CreateDirectory(outputFolder!);
+        }
+
+        using (var target = new ZipArchive(File.Open(packagePath, FileMode.Open, FileAccess.Read), ZipArchiveMode.Read))
+        using (var baseline = new ZipArchive(baselineStream, ZipArchiveMode.Read))
+        using (Helpers.UseTempDir(out var tempFolder))
+        {
+            var targetDlls = GetDlls(target);
+            var baselineDlls = GetDlls(baseline);
+
+            var pairs = new List<(string baseline, string target)>();
+
+            var packageId = GetPackageId(packagePath);
+
+            // Don't use Path.Combine with these left and right tool parameters.
+            // Microsoft.DotNet.ApiCompat.Tool is stupid and treats '/' and '\' as different assemblies in suppression files.
+            // So, always use Unix '/'
+            foreach (var baselineDll in baselineDlls)
+            {
+                var baselineDllPath = await ExtractDll("baseline", baselineDll, tempFolder);
+
+                var targetTfm = baselineDll.target;
+                if (s_tfmRedirects.FirstOrDefault(t => baselineDll.target.StartsWith(t.oldTfm)).newTfm is {} newTfm)
+                {
+                    targetTfm = newTfm;
+                }
+
+                var targetDll = targetDlls.FirstOrDefault(e =>
+                    e.target.StartsWith(targetTfm) && e.entry.Name == baselineDll.entry.Name);
+                if (targetDll?.entry is null)
+                {
+                    throw new InvalidOperationException($"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}");
+                }
+
+                var targetDllPath = await ExtractDll("target", targetDll, tempFolder);
+
+                pairs.Add((baselineDllPath, targetDllPath));
+            }
+
+            await Task.WhenAll(pairs.Select(p => Task.Run(() =>
+            {
+                var baselineApi = p.baseline + ".api.cs";
+                var targetApi = p.target + ".api.cs";
+                var resultDiff = p.target + ".api.diff.cs";
+                
+                GenerateApiListing(apiDiffTool, p.baseline, baselineApi, tempFolder);
+                GenerateApiListing(apiDiffTool, p.target, targetApi, tempFolder);
+
+                var args = $"""-c core.autocrlf=false diff --no-index --minimal """;
+                args += """--ignore-matching-lines="^\[assembly: System.Reflection.AssemblyVersionAttribute" """;
+                args += $""" --output {resultDiff} {baselineApi} {targetApi}""";
+
+                using (var gitProcess = new Process())
+                {
+                    gitProcess.StartInfo = new ProcessStartInfo
+                    {
+                        CreateNoWindow = true,
+                        RedirectStandardError = false,
+                        RedirectStandardOutput = false,
+                        FileName = "git",
+                        Arguments = args,
+                        WorkingDirectory = tempFolder
+                    };
+                    gitProcess.Start();
+                    gitProcess.WaitForExit();
+                }
+
+                var resultFile = new FileInfo(Path.Combine(tempFolder, resultDiff));
+                if (resultFile.Length > 0)
+                {
+                    resultFile.CopyTo(Path.Combine(outputFolder, Path.GetFileName(resultDiff)), true);
+                }
+            })));
+        }
+    }
 
     private static readonly (string oldTfm, string newTfm)[] s_tfmRedirects = new[]
     {
@@ -25,12 +112,6 @@ public static class ApiDiffValidation
         Tool apiCompatTool, string packagePath, string baselineVersion,
         string suppressionFilesFolder, bool updateSuppressionFile)
     {
-        if (baselineVersion is null)
-        {
-            throw new InvalidOperationException(
-                "Build \"api-baseline\" parameter must be set when running Nuke CreatePackages");
-        }
-
         if (!Directory.Exists(suppressionFilesFolder))
         {
             Directory.CreateDirectory(suppressionFilesFolder!);
@@ -58,13 +139,7 @@ public static class ApiDiffValidation
             // So, always use Unix '/'
             foreach (var baselineDll in baselineDlls)
             {
-                var baselineDllPath = $"baseline/{baselineDll.target}/{baselineDll.entry.Name}";
-                var baselineDllRealPath = Path.Combine(tempFolder, baselineDllPath);
-                Directory.CreateDirectory(Path.GetDirectoryName(baselineDllRealPath)!);
-                await using (var baselineDllFile = File.Create(baselineDllRealPath))
-                {
-                    await baselineDll.entry.Open().CopyToAsync(baselineDllFile);
-                }
+                var baselineDllPath = await ExtractDll("baseline", baselineDll, tempFolder);
 
                 var targetTfm = baselineDll.target;
                 if (s_tfmRedirects.FirstOrDefault(t => baselineDll.target.StartsWith(t.oldTfm)).newTfm is {} newTfm)
@@ -79,13 +154,7 @@ public static class ApiDiffValidation
                     throw new InvalidOperationException($"Some assemblies are missing in the new package {packageId}: {baselineDll.entry.Name} for {baselineDll.target}");
                 }
 
-                var targetDllPath = $"target/{targetDll.target}/{targetDll.entry.Name}";
-                var targetDllRealPath = Path.Combine(tempFolder, targetDllPath);
-                Directory.CreateDirectory(Path.GetDirectoryName(targetDllRealPath)!);
-                await using (var targetDllFile = File.Create(targetDllRealPath))
-                {
-                    await targetDll.entry.Open().CopyToAsync(targetDllFile);
-                }
+                var targetDllPath = await ExtractDll("target", targetDll, tempFolder);
 
                 left.Add(baselineDllPath);
                 right.Add(targetDllPath);
@@ -116,7 +185,9 @@ public static class ApiDiffValidation
         }
     }
 
-    private static IReadOnlyCollection<(string target, ZipArchiveEntry entry)> GetDlls(ZipArchive archive)
+    record DllEntry(string target, ZipArchiveEntry entry);
+    
+    static IReadOnlyCollection<DllEntry> GetDlls(ZipArchive archive)
     {
         return archive.Entries
             .Where(e => Path.GetExtension(e.FullName) == ".dll"
@@ -130,12 +201,18 @@ public static class ApiDiffValidation
             )
             .GroupBy(e => (e.target, e.entry.Name))
             .Select(g => g.MaxBy(e => e.isRef))
-            .Select(e => (e.target, e.entry))
+            .Select(e => new DllEntry(e.target, e.entry))
             .ToArray();
     }
 
     static async Task<Stream> DownloadBaselinePackage(string packagePath, string baselineVersion)
     {
+        if (baselineVersion is null)
+        {
+            throw new InvalidOperationException(
+                "Build \"api-baseline\" parameter must be set when running Nuke CreatePackages");
+        }
+
         /*
          Gets package name from versions like:
          Avalonia.0.10.0-preview1
@@ -167,6 +244,31 @@ public static class ApiDiffValidation
         }
     }
 
+    static async Task<string> ExtractDll(string basePath, DllEntry dllEntry, string targetFolder)
+    {
+        var dllPath = $"{basePath}/{dllEntry.target}/{dllEntry.entry.Name}";
+        var dllRealPath = Path.Combine(targetFolder, dllPath);
+        Directory.CreateDirectory(Path.GetDirectoryName(dllRealPath)!);
+        await using (var dllFile = File.Create(dllRealPath))
+        {
+            await dllEntry.entry.Open().CopyToAsync(dllFile);
+        }
+
+        return dllPath;
+    }
+
+    static void GenerateApiListing(Tool apiDiffTool, string inputFile, string outputFile, string workingDif)
+    {
+        var args = $""" --assembly={inputFile}  --output-path={outputFile}  --include-assembly-attributes=true""";
+        var result = apiDiffTool(args, workingDif)
+            .Where(t => t.Type == OutputType.Err).ToArray();
+        if (result.Any())
+        {
+            throw new AggregateException($"GetApi tool failed task has failed",
+                result.Select(r => new Exception(r.Text)));
+        }
+    }
+
     static string GetPackageId(string packagePath)
     {
         return Regex.Replace(
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
index 8b5cc4292a..871af047cd 100644
--- a/nukebuild/Build.cs
+++ b/nukebuild/Build.cs
@@ -18,6 +18,7 @@ using static Nuke.Common.Tools.Xunit.XunitTasks;
 using static Nuke.Common.Tools.VSWhere.VSWhereTasks;
 using static Serilog.Log;
 using MicroCom.CodeGenerator;
+using Nuke.Common.IO;
 
 /*
  Before editing this file, install support plugin for your IDE,
@@ -33,6 +34,9 @@ partial class Build : NukeBuild
 
     [PackageExecutable("Microsoft.DotNet.ApiCompat.Tool", "Microsoft.DotNet.ApiCompat.Tool.dll", Framework = "net6.0")]
     Tool ApiCompatTool;
+    
+    [PackageExecutable("Microsoft.DotNet.GenAPI.Tool", "Microsoft.DotNet.GenAPI.Tool.dll", Framework = "net8.0")]
+    Tool ApiGenTool;
 
     protected override void OnBuildInitialized()
     {
@@ -283,11 +287,21 @@ partial class Build : NukeBuild
         .Executes(async () =>
         {
             await Task.WhenAll(
-                Directory.GetFiles(Parameters.NugetRoot, "*.nupkg").Select(nugetPackage => ApiDiffValidation.ValidatePackage(
+                Directory.GetFiles(Parameters.NugetRoot, "*.nupkg").Select(nugetPackage => ApiDiffHelper.ValidatePackage(
                     ApiCompatTool, nugetPackage, Parameters.ApiValidationBaseline,
                     Parameters.ApiValidationSuppressionFiles, Parameters.UpdateApiValidationSuppression)));
         });
     
+    Target OutputApiDiff => _ => _
+        .DependsOn(CreateNugetPackages)
+        .Executes(async () =>
+        {
+            await Task.WhenAll(
+                Directory.GetFiles(Parameters.NugetRoot, "*.nupkg").Select(nugetPackage => ApiDiffHelper.GetDiff(
+                    ApiGenTool, RootDirectory / "api" / "diff",
+                    nugetPackage, Parameters.ApiValidationBaseline)));
+        });
+    
     Target RunTests => _ => _
         .DependsOn(RunCoreLibsTests)
         .DependsOn(RunRenderTests)
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
index 1286102347..8a1d7069b8 100644
--- a/nukebuild/_build.csproj
+++ b/nukebuild/_build.csproj
@@ -7,6 +7,8 @@
     <NoWarn>$(NoWarn);CS0649;CS0169;SYSLIB0011</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
     <TargetFramework>net7.0</TargetFramework>
+    <!-- Necessary for Microsoft.DotNet.GenAPI.Tool -->
+    <RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <Import Project="..\build\JetBrains.dotMemoryUnit.props" />
@@ -24,6 +26,7 @@
     </PackageReference>
 
     <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[7.0.305]" />
+    <PackageDownload Include="Microsoft.DotNet.GenAPI.Tool" Version="[8.0.101-servicing.23580.12]" />
   </ItemGroup>
 
   <ItemGroup>

From 23b5e37dace75bb9acd08cd085ca0b3876250e04 Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Fri, 22 Dec 2023 13:07:39 +0100
Subject: [PATCH 15/33] Update Tmds.DBus.SourceGenerator to 0.0.13 (#14010)

Changelog 0.0.11 .. 0.0.13

- 7b8f0afca3a96499b88ae52a84211b116e214f46 Fix parsing struct signature
- bd4c0e3a1ad794f1c40d847567ecf1102a8c8ae2 Cast instead of using covariant arrays, fix code style
- 3c52d1de172889099ac21840f8ecc480895154bb do not change method name casing
---
 src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
index 27a1af95ff..a77be77c87 100644
--- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
+++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Tmds.DBus.Protocol" Version="0.15.0" />
-    <PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.11" PrivateAssets="All" />
+    <PackageReference Include="Tmds.DBus.SourceGenerator" Version="0.0.13" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

From 75e7c8d0207c514b0864440d7c918c199be7baea Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Fri, 22 Dec 2023 13:39:48 +0100
Subject: [PATCH 16/33] Remove missing MVID warning on XAML compilation
 (#14014)

---
 packages/Avalonia/AvaloniaBuildTasks.targets | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 2232ea35af..ef5658f1ca 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -131,6 +131,7 @@
       <AvaloniaXamlIlVerifyIl Condition="'$(AvaloniaXamlIlVerifyIl)' == ''">false</AvaloniaXamlIlVerifyIl>
       <AvaloniaXamlIlDebuggerLaunch Condition="'$(AvaloniaXamlIlDebuggerLaunch)' == ''">false</AvaloniaXamlIlDebuggerLaunch>
       <AvaloniaXamlVerboseExceptions Condition="'$(AvaloniaXamlVerboseExceptions)' == ''">false</AvaloniaXamlVerboseExceptions>
+      <_AvaloniaHasCompiledXaml>true</_AvaloniaHasCompiledXaml>
     </PropertyGroup>
     <WriteLinesToFile
       Condition="'$(_AvaloniaForceInternalMSBuild)' != 'true'"
@@ -195,4 +196,25 @@
     <Exec Command="dotnet exec --runtimeconfig &quot;$(APreviewerRuntimeConfigPath)&quot; --depsfile &quot;$(APreviewerDepsJsonPath)&quot; &quot;$(AvaloniaPreviewerNetCoreToolPath)&quot; --method html --html-url $(APreviewerUrl) --transport $(APreviewTransportUrl)  &quot;$(APreviewExecutable)&quot;"/>
      
   </Target>
+
+  <!--
+    Deletes the target ref assembly before the CopyRefAssembly task (in target CopyFilesToOutputDirectory) tries to access it.
+
+    CopyRefAssembly reads the ref assembly's MVID from the .mvid PE section to avoid copying if necessary.
+    However, Cecil doesn't preserve that PE section: this results in a warning.
+    By deleting the file beforehand, we're preventing the warning.
+    There are no changes in behavior since CopyRefAssembly always copy the file if it couldn't read the MVID.
+  -->
+  <Target
+    Name="AvaloniaDeleteRefAssemblyBeforeOutputCopy"
+    BeforeTargets="CopyFilesToOutputDirectory"
+    Condition="
+      '$(_AvaloniaHasCompiledXaml)' == 'true' and
+      '$(TargetRefPath)' != '' and
+      '$(ProduceReferenceAssembly)' == 'true' and
+      ('$(CopyBuildOutputToOutputDirectory)' == '' or '$(CopyBuildOutputToOutputDirectory)' == 'true') and
+      '$(SkipCopyBuildProduct)' != 'true'">
+    <Delete Files="$(TargetRefPath)" Condition="Exists('$(TargetRefPath)')" />
+  </Target>
+
 </Project>

From b450c9e286e2a4d160ef7fdc55a0957c39e176d5 Mon Sep 17 00:00:00 2001
From: zavaleriy <137711511+zavaleriy@users.noreply.github.com>
Date: Sat, 23 Dec 2023 22:44:03 +0300
Subject: [PATCH 17/33] Fixed color of selected DataGridRow (#14026)

---
 src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 4f4ae74dd9..6e7d616181 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -15,6 +15,10 @@
           <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
           <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
           <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
           <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
           <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
           <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
@@ -34,6 +38,10 @@
           <SolidColorBrush x:Key="DataGridRowGroupHeaderHoveredBackgroundBrush" Color="{DynamicResource SystemListLowColor}" />
           <SolidColorBrush x:Key="DataGridRowHoveredBackgroundColor" Color="{DynamicResource SystemListLowColor}" />
           <SolidColorBrush x:Key="DataGridRowInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
+          <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
           <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="{DynamicResource SystemBaseHighColor}" />
           <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="{DynamicResource SystemAltMediumColor}" />
           <SolidColorBrush x:Key="DataGridCellInvalidBrush" Color="{DynamicResource SystemErrorTextColor}" />
@@ -53,13 +61,9 @@
     <StreamGeometry x:Key="DataGridRowGroupHeaderIconOpenedPath">M109 486 19 576 1024 1581 2029 576 1939 486 1024 1401z</StreamGeometry>
 
     <StaticResource x:Key="DataGridRowBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedHoveredBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedHoveredBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedUnfocusedBackgroundOpacity" ResourceKey="ListAccentLowOpacity" />
-    <SolidColorBrush x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundBrush" Color="{DynamicResource SystemAccentColor}" />
     <StaticResource x:Key="DataGridRowSelectedHoveredUnfocusedBackgroundOpacity" ResourceKey="ListAccentMediumOpacity" />
     <StaticResource x:Key="DataGridCellBackgroundBrush" ResourceKey="SystemControlTransparentBrush" />
     <StaticResource x:Key="DataGridCurrencyVisualPrimaryBrush" ResourceKey="SystemControlTransparentBrush" />

From 21ad94b98085767674204e7da71dd2b403759c38 Mon Sep 17 00:00:00 2001
From: SKProCH <29896317+SKProCH@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:52:25 +0300
Subject: [PATCH 18/33] Fixes Border and Shape border re-rendering when
 changing Brush value (#13980)

* Adds the ImmutablePenWithDynamicBrush and fixes Border and Shape border re-rendering when changing Brush value

* Removes the ImmutablePenWithDynamicBrush, rollback to Pen

* Cache and reuse Pen

* Move all Pen's updating logic to Pen.TryModifyOrCreate

* Add some tests for Pen.TryModifyOrCreate

* Add proper handling for DashStyle

* Invert condition in Pen.TryModifyOrCreate, fixes the logic

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
Co-authored-by: Tim <47110241+timunie@users.noreply.github.com>
---
 src/Avalonia.Base/Media/Pen.cs                | 90 ++++++++++++++++---
 src/Avalonia.Controls/Shapes/Shape.cs         | 63 +++++++------
 .../Utils/BorderRenderHelper.cs               | 34 ++-----
 .../Avalonia.Base.UnitTests/Media/PenTests.cs | 83 ++++++++++++++++-
 4 files changed, 196 insertions(+), 74 deletions(-)

diff --git a/src/Avalonia.Base/Media/Pen.cs b/src/Avalonia.Base/Media/Pen.cs
index ad0bc66276..26001df4f7 100644
--- a/src/Avalonia.Base/Media/Pen.cs
+++ b/src/Avalonia.Base/Media/Pen.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Avalonia.Collections;
 using Avalonia.Media.Immutable;
 using Avalonia.Rendering.Composition;
 using Avalonia.Rendering.Composition.Drawing;
@@ -56,8 +59,7 @@ namespace Avalonia.Media
         /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         public Pen()
-        {
-        }
+        { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Pen"/> class.
@@ -75,8 +77,7 @@ namespace Avalonia.Media
             PenLineCap lineCap = PenLineCap.Flat,
             PenLineJoin lineJoin = PenLineJoin.Miter,
             double miterLimit = 10.0) : this(new SolidColorBrush(color), thickness, dashStyle, lineCap, lineJoin, miterLimit)
-        {
-        }
+        { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Pen"/> class.
@@ -178,6 +179,69 @@ namespace Avalonia.Media
                 MiterLimit);
         }
         
+        /// <summary>
+        /// Smart reuse and update pen properties.
+        /// </summary>
+        /// <param name="pen">Old pen to modify.</param>
+        /// <param name="brush">The brush used to draw.</param>
+        /// <param name="thickness">The stroke thickness.</param>
+        /// <param name="strokeDashArray">The stroke dask array.</param>
+        /// <param name="strokeDaskOffset">The stroke dask offset.</param>
+        /// <param name="lineCap">The line cap.</param>
+        /// <param name="lineJoin">The line join.</param>
+        /// <param name="miterLimit">The miter limit.</param>
+        /// <returns>If a new instance was created and visual invalidation required.</returns>
+        internal static bool TryModifyOrCreate(ref IPen? pen,
+                                             IBrush? brush,
+                                             double thickness,
+                                             IList<double>? strokeDashArray = null,
+                                             double strokeDaskOffset = default,
+                                             PenLineCap lineCap = PenLineCap.Flat,
+                                             PenLineJoin lineJoin = PenLineJoin.Miter,
+                                             double miterLimit = 10.0)
+        {
+            var previousPen = pen;
+            if (brush is null)
+            {
+                pen = null;
+                return previousPen is not null;
+            }
+            
+            IDashStyle? dashStyle = null;
+            if (strokeDashArray is { Count: > 0 })
+            {
+                // strokeDashArray can be IList (instead of AvaloniaList) in future
+                // So, if it supports notification - create a mutable DashStyle
+                dashStyle = strokeDashArray is INotifyCollectionChanged 
+                    ? new DashStyle(strokeDashArray, strokeDaskOffset) 
+                    : new ImmutableDashStyle(strokeDashArray, strokeDaskOffset);
+            }
+            
+            if (brush is IImmutableBrush immutableBrush && dashStyle is null or ImmutableDashStyle)
+            {
+                pen = new ImmutablePen(
+                    immutableBrush,
+                    thickness,
+                    (ImmutableDashStyle?)dashStyle,
+                    lineCap,
+                    lineJoin,
+                    miterLimit);
+
+                return true;
+            }
+
+            var mutablePen = previousPen as Pen ?? new Pen();
+            mutablePen.Brush = brush;
+            mutablePen.Thickness = thickness;
+            mutablePen.LineCap = lineCap;
+            mutablePen.LineJoin = lineJoin;
+            mutablePen.DashStyle = dashStyle;
+            mutablePen.MiterLimit = miterLimit;
+
+            pen = mutablePen;
+            return !Equals(previousPen, pen);
+        }
+
         void RegisterForSerialization()
         {
             _resource.RegisterForInvalidationOnAllCompositors(this);
@@ -186,21 +250,21 @@ namespace Avalonia.Media
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
         {
             RegisterForSerialization();
-            
-            if (change.Property == BrushProperty) 
+
+            if (change.Property == BrushProperty)
                 _resource.ProcessPropertyChangeNotification(change);
-            
-            if(change.Property == DashStyleProperty)
+
+            if (change.Property == DashStyleProperty)
                 UpdateDashStyleSubscription();
             base.OnPropertyChanged(change);
         }
 
-        
+
         void UpdateDashStyleSubscription()
         {
             var newValue = _resource.IsAttached ? DashStyle as DashStyle : null;
-            
-            if(ReferenceEquals(_subscribedToDashes, newValue))
+
+            if (ReferenceEquals(_subscribedToDashes, newValue))
                 return;
 
             if (_subscribedToDashes != null && _weakSubscriber != null)
@@ -221,9 +285,9 @@ namespace Avalonia.Media
                 _subscribedToDashes = newValue;
             }
         }
-        
+
         private CompositorResourceHolder<ServerCompositionSimplePen> _resource;
-        
+
         IPen ICompositionRenderResource<IPen>.GetForCompositor(Compositor c) => _resource.GetForCompositor(c);
 
         void ICompositionRenderResource.AddRefOnCompositor(Compositor c)
diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index a65ac774ef..c10e4d766d 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Avalonia.Collections;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
@@ -62,14 +63,7 @@ namespace Avalonia.Controls.Shapes
         private Matrix _transform = Matrix.Identity;
         private Geometry? _definingGeometry;
         private Geometry? _renderedGeometry;
-
-        static Shape()
-        {
-            AffectsMeasure<Shape>(StretchProperty, StrokeThicknessProperty);
-
-            AffectsRender<Shape>(FillProperty, StrokeProperty, StrokeDashArrayProperty, StrokeDashOffsetProperty,
-                StrokeThicknessProperty, StrokeLineCapProperty, StrokeJoinProperty);
-        }
+        private IPen? _strokePen;
 
         /// <summary>
         /// Gets a value that represents the <see cref="Geometry"/> of the shape.
@@ -199,30 +193,7 @@ namespace Avalonia.Controls.Shapes
 
             if (geometry != null)
             {
-                var stroke = Stroke;
-
-                ImmutablePen? pen = null;
-
-                if (stroke != null)
-                {
-                    var strokeDashArray = StrokeDashArray;
-
-                    ImmutableDashStyle? dashStyle = null;
-
-                    if (strokeDashArray != null && strokeDashArray.Count > 0)
-                    {
-                        dashStyle = new ImmutableDashStyle(strokeDashArray, StrokeDashOffset);
-                    }
-
-                    pen = new ImmutablePen(
-                        stroke.ToImmutable(),
-                        StrokeThickness,
-                        dashStyle,
-                        StrokeLineCap,
-                        StrokeJoin);
-                }
-
-                context.DrawGeometry(Fill, pen, geometry);
+                context.DrawGeometry(Fill, _strokePen, geometry);
             }
         }
 
@@ -266,6 +237,34 @@ namespace Avalonia.Controls.Shapes
             InvalidateMeasure();
         }
 
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == StrokeProperty
+                || change.Property == StrokeThicknessProperty
+                || change.Property == StrokeDashArrayProperty
+                || change.Property == StrokeDashOffsetProperty
+                || change.Property == StrokeLineCapProperty
+                || change.Property == StrokeJoinProperty)
+            {
+                if (change.Property == StrokeProperty
+                    || change.Property == StrokeThicknessProperty)
+                {
+                    InvalidateMeasure();
+                }
+                
+                if (!Pen.TryModifyOrCreate(ref _strokePen, Stroke, StrokeThickness, StrokeDashArray, StrokeDashOffset, StrokeLineCap, StrokeJoin))
+                {
+                    InvalidateVisual();
+                }
+            }
+            else if (change.Property == FillProperty)
+            {
+                InvalidateVisual();
+            }
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             if (DefiningGeometry is null)
diff --git a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
index 799cc47d0c..4df4fd738a 100644
--- a/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
+++ b/src/Avalonia.Controls/Utils/BorderRenderHelper.cs
@@ -17,6 +17,7 @@ namespace Avalonia.Controls.Utils
         private Thickness _borderThickness;
         private CornerRadius _cornerRadius;
         private bool _initialized;
+        private IPen? _cachedPen;
 
 
         void Update(Size finalSize, Thickness borderThickness, CornerRadius cornerRadius)
@@ -87,22 +88,17 @@ namespace Avalonia.Controls.Utils
 
         public void Render(DrawingContext context,
             Size finalSize, Thickness borderThickness, CornerRadius cornerRadius,
-            IBrush? background, IBrush? borderBrush, BoxShadows boxShadows, double borderDashOffset = 0,
-            PenLineCap borderLineCap = PenLineCap.Flat, PenLineJoin borderLineJoin = PenLineJoin.Miter,
-            AvaloniaList<double>? borderDashArray = null)
+            IBrush? background, IBrush? borderBrush, BoxShadows boxShadows)
         {
             if (_size != finalSize
                 || _borderThickness != borderThickness
                 || _cornerRadius != cornerRadius
                 || !_initialized)
                 Update(finalSize, borderThickness, cornerRadius);
-            RenderCore(context, background, borderBrush, boxShadows, borderDashOffset, borderLineCap, borderLineJoin,
-                borderDashArray);
+            RenderCore(context, background, borderBrush, boxShadows);
         }
 
-        void RenderCore(DrawingContext context, IBrush? background, IBrush? borderBrush, BoxShadows boxShadows,
-            double borderDashOffset, PenLineCap borderLineCap, PenLineJoin borderLineJoin,
-            AvaloniaList<double>? borderDashArray)
+        void RenderCore(DrawingContext context, IBrush? background, IBrush? borderBrush, BoxShadows boxShadows)
         {
             if (_useComplexRendering)
             {
@@ -121,26 +117,8 @@ namespace Avalonia.Controls.Utils
             else
             {
                 var borderThickness = _borderThickness.Top;
-                IPen? pen = null;
-
-
-                ImmutableDashStyle? dashStyle = null;
-
-                if (borderDashArray != null && borderDashArray.Count > 0)
-                {
-                    dashStyle = new ImmutableDashStyle(borderDashArray, borderDashOffset);
-                }
-
-                if (borderBrush != null && borderThickness > 0)
-                {
-                    pen = new ImmutablePen(
-                        borderBrush.ToImmutable(),
-                        borderThickness,
-                        dashStyle,
-                        borderLineCap,
-                        borderLineJoin);
-                }
 
+                Pen.TryModifyOrCreate(ref _cachedPen, borderBrush, borderThickness);
 
                 var rect = new Rect(_size);
                 if (!MathUtilities.IsZero(borderThickness))
@@ -148,7 +126,7 @@ namespace Avalonia.Controls.Utils
                 var rrect = new RoundedRect(rect, _cornerRadius.TopLeft, _cornerRadius.TopRight,
                     _cornerRadius.BottomRight, _cornerRadius.BottomLeft);
 
-                context.DrawRectangle(background, pen, rrect, boxShadows);
+                context.DrawRectangle(background, _cachedPen, rrect, boxShadows);
             }
         }
 
diff --git a/tests/Avalonia.Base.UnitTests/Media/PenTests.cs b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
index 156a25c678..a20f112939 100644
--- a/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/PenTests.cs
@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using Avalonia.Collections;
 using Avalonia.Media;
 using Avalonia.Media.Immutable;
@@ -116,5 +117,85 @@ namespace Avalonia.Base.UnitTests.Media
 
             Assert.True(Equals(target1, target2));
         }
+        
+        [Fact]
+        public void TryModifyOrCreate_Should_Return_True_When_Previous_Exists_And_Assign_Null_When_Brush_Is_Null()
+        {
+            IPen? target = new ImmutablePen(
+                brush: new ImmutableSolidColorBrush(Colors.Red),
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            var result = Pen.TryModifyOrCreate(ref target, null, 2);
+
+            Assert.True(result);
+            Assert.Null(target);
+        }
+
+        [Fact]
+        public void TryModifyOrCreate_Should_Return_False_When_Previous_Not_Exists_And_Assign_Null_When_Brush_Is_Null()
+        {
+            IPen? target = null;
+
+            var result = Pen.TryModifyOrCreate(ref target, null, 2);
+
+            Assert.False(result);
+            Assert.Null(target);
+        }
+        
+        [Fact]
+        public void TryModifyOrCreate_Should_Return_True_When_Previous_Immutable_And_Assign_Mutable_When_Brush_Is_Mutable()
+        {
+            IPen? target = new ImmutablePen(
+                brush: new ImmutableSolidColorBrush(Colors.Red),
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            var result = Pen.TryModifyOrCreate(ref target, new SolidColorBrush(Colors.Blue), 2);
+
+            Assert.True(result);
+            Assert.IsType<Pen>(target);
+        }
+        
+        [Fact]
+        public void TryModifyOrCreate_Should_Return_True_When_Previous_Immutable_And_Assign_Immutable_When_Brush_Is_Immutable()
+        {
+            IPen? target = new ImmutablePen(
+                brush: new ImmutableSolidColorBrush(Colors.Red),
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+
+            var result = Pen.TryModifyOrCreate(ref target, new ImmutableSolidColorBrush(Colors.Blue), 2);
+
+            Assert.True(result);
+            Assert.IsType<ImmutablePen>(target);
+        }
+        
+        [Fact]
+        public void TryModifyOrCreate_Should_Return_False_When_Previous_Mutable_And_Modify_Mutable_When_Brush_Is_Mutable()
+        {
+            var oldPen = new Pen(
+                brush: new SolidColorBrush(Colors.Red),
+                thickness: 2,
+                dashStyle: new ImmutableDashStyle(new[] { 0.1, 0.2 }, 5),
+                lineCap: PenLineCap.Round,
+                lineJoin: PenLineJoin.Round,
+                miterLimit: 21);
+            IPen? target = oldPen;
+
+            var result = Pen.TryModifyOrCreate(ref target, new SolidColorBrush(Colors.Blue), 2);
+
+            Assert.False(result);
+            Assert.Same(oldPen, target);
+        }
     }
 }

From fe671b2cebf6f0a4b55e1a3a5a55cd7969c1122a Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Fri, 29 Dec 2023 00:17:31 +0100
Subject: [PATCH 19/33] perf(Android): Avoid allocation of object array
 (#14046)

* perf(Android): Avoid allocation of object array

Avoid allocating a new array of objects when the Compositor enumeration the surfaces

* fix: Address review
---
 .../Platform/SkiaPlatform/TopLevelImpl.cs                 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index e9f9050af1..d547a2913a 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.Versioning;
 using System.Threading;
 using Android.App;
 using Android.Content;
 using Android.Graphics;
 using Android.Graphics.Drawables;
-using Android.OS;
 using Android.Runtime;
 using Android.Text;
 using Android.Views;
@@ -27,10 +25,8 @@ using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Platform.Storage;
-using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 using Java.Lang;
-using static System.Net.Mime.MediaTypeNames;
 using ClipboardManager = Android.Content.ClipboardManager;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
@@ -76,6 +72,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             _transparencyLevel = WindowTransparencyLevel.None;
 
             _systemNavigationManager = new AndroidSystemNavigationManagerImpl(avaloniaView.Context as IActivityNavigationService);
+
+            Surfaces = new object[] { _gl, _framebuffer, Handle };
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>
@@ -107,7 +105,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public IPlatformHandle Handle => _view;
 
-        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer, Handle };
+        public IEnumerable<object> Surfaces { get; }
 
         public Compositor Compositor => AndroidPlatform.Compositor;
         

From 7cea2b152356fa54f7fb3117f296e9091ed85da1 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 2 Jan 2024 14:58:40 +0000
Subject: [PATCH 20/33] enable sub-pixel for all antialiased fonts including
 Grayscale (non cleartype anti aliasing) (#14080)

---
 src/Skia/Avalonia.Skia/GlyphRunImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
index 10337f77c2..8e07dc5724 100644
--- a/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
+++ b/src/Skia/Avalonia.Skia/GlyphRunImpl.cs
@@ -130,7 +130,7 @@ namespace Avalonia.Skia
             var font = _glyphTypefaceImpl.CreateSKFont((float)FontRenderingEmSize);
 
             font.Hinting = SKFontHinting.Full;
-            font.Subpixel = edging == SKFontEdging.SubpixelAntialias;
+            font.Subpixel = edging != SKFontEdging.Alias;
             font.Edging = edging;
 
             return font;

From d0f38218b70a38474d360e271609bd6bc2fdf3c8 Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Wed, 3 Jan 2024 01:19:09 +0100
Subject: [PATCH 21/33] perf: remove some closure (#14050)

Avoid allocating a new object to pass the argument to the anonymous delegate
---
 src/Avalonia.Controls/Remote/RemoteWidget.cs  |  4 +--
 .../Remote/RemoteDesignerEntryPoint.cs        | 12 +++----
 .../AvaloniaNativeMenuExporter.cs             | 12 ++++---
 src/Avalonia.X11/X11PlatformLifetimeEvents.cs | 31 ++++++++++---------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Controls/Remote/RemoteWidget.cs b/src/Avalonia.Controls/Remote/RemoteWidget.cs
index b9854ab837..11eb53ceb5 100644
--- a/src/Avalonia.Controls/Remote/RemoteWidget.cs
+++ b/src/Avalonia.Controls/Remote/RemoteWidget.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Remote
             Mode = SizingMode.Local;
 
             _connection = connection;
-            _connection.OnMessage += (t, msg) => Dispatcher.UIThread.Post(() => OnMessage(msg));
+            _connection.OnMessage += (t, msg) => Dispatcher.UIThread.Post(OnMessage, msg);
             _connection.Send(new ClientSupportedPixelFormatsMessage
             {
                 Formats = new[]
@@ -39,7 +39,7 @@ namespace Avalonia.Controls.Remote
 
         public SizingMode Mode { get; set; }
 
-        private void OnMessage(object msg)
+        private void OnMessage(object? msg)
         {
             if (msg is FrameMessage frame)
             {
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index 8ec1b35a6c..24074f9c8c 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -202,24 +202,24 @@ namespace Avalonia.DesignerSupport.Remote
         }
 
         private static Window s_currentWindow;
-        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.Post(() =>
+        private static void OnTransportMessage(IAvaloniaRemoteTransportConnection transport, object obj) => Dispatcher.UIThread.Post(static arg =>
         {
-            if (obj is ClientSupportedPixelFormatsMessage formats)
+            if (arg is ClientSupportedPixelFormatsMessage formats)
             {
                 s_supportedPixelFormats = formats;
                 RebuildPreFlight();
             }
-            if (obj is ClientRenderInfoMessage renderInfo)
+            if (arg is ClientRenderInfoMessage renderInfo)
             {
                 s_renderInfoMessage = renderInfo;
                 RebuildPreFlight();
             }
-            if (obj is ClientViewportAllocatedMessage viewport)
+            if (arg is ClientViewportAllocatedMessage viewport)
             {
                 s_viewportAllocatedMessage = viewport;
                 RebuildPreFlight();
             }
-            if (obj is UpdateXamlMessage xaml)
+            if (arg is UpdateXamlMessage xaml)
             {
                 if (s_currentWindow is not null)
                     s_lastRenderScaling = s_currentWindow.RenderScaling;
@@ -247,6 +247,6 @@ namespace Avalonia.DesignerSupport.Remote
                     });
                 }
             }
-        });
+        }, obj);
     }
 }
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index 7c7b32f7e4..157925e35a 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -146,6 +146,8 @@ namespace Avalonia.Native
             appMenu.Add(quitItem);
         }
 
+        private void DoLayoutReset() => DoLayoutReset(false);
+
         private void DoLayoutReset(bool forceUpdate = false)
         {
             var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>() ?? new MacOSPlatformOptions();
@@ -195,7 +197,7 @@ namespace Avalonia.Native
             if (_resetQueued)
                 return;
             _resetQueued = true;
-            Dispatcher.UIThread.Post(() => DoLayoutReset(), DispatcherPriority.Background);
+            Dispatcher.UIThread.Post(DoLayoutReset, DispatcherPriority.Background);
         }
 
         private void SetMenu(NativeMenu menu)
@@ -252,9 +254,9 @@ namespace Avalonia.Native
             {
                 _nativeMenu = __MicroComIAvnMenuProxy.Create(_factory);
 
-                _nativeMenu.Initialize(this, menu, "");     
+                _nativeMenu.Initialize(this, menu, "");
 
-                setMenu = true;           
+                setMenu = true;
             }
 
             _nativeMenu.Update(_factory, menu);
@@ -273,9 +275,9 @@ namespace Avalonia.Native
             {
                 _nativeMenu = __MicroComIAvnMenuProxy.Create(_factory);
 
-                _nativeMenu.Initialize(this, menu, "");     
+                _nativeMenu.Initialize(this, menu, "");
 
-                setMenu = true;           
+                setMenu = true;
             }
 
             _nativeMenu.Update(_factory, menu);
diff --git a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
index 8412bd0730..f03ed6f1ef 100644
--- a/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
+++ b/src/Avalonia.X11/X11PlatformLifetimeEvents.cs
@@ -223,28 +223,31 @@ namespace Avalonia.X11
 
         private void InteractHandler(IntPtr smcConn)
         {
-            Dispatcher.UIThread.Post(() => ActualInteractHandler(smcConn));
+            Dispatcher.UIThread.Post(ActualInteractHandler, smcConn);
         }
 
-        private void ActualInteractHandler(IntPtr smcConn)
+        private void ActualInteractHandler(object? state)
         {
-            var e = new ShutdownRequestedEventArgs();
-
-            if (_platform.Options?.EnableSessionManagement ?? false)
+            if (state is IntPtr smcConn)
             {
-                ShutdownRequested?.Invoke(this, e);
-            }
+                var e = new ShutdownRequestedEventArgs();
 
-            SMLib.SmcInteractDone(smcConn, e.Cancel);
+                if (_platform.Options?.EnableSessionManagement ?? false)
+                {
+                    ShutdownRequested?.Invoke(this, e);
+                }
 
-            if (e.Cancel)
-            {
-                return;
-            }
+                SMLib.SmcInteractDone(smcConn, e.Cancel);
 
-            _saveYourselfPhase = false;
+                if (e.Cancel)
+                {
+                    return;
+                }
+
+                _saveYourselfPhase = false;
 
-            SMLib.SmcSaveYourselfDone(smcConn, true);
+                SMLib.SmcSaveYourselfDone(smcConn, true);
+            }
         }
 
         private static void IceWatchHandler(IntPtr iceConn, IntPtr clientData, bool opening, IntPtr* watchData)

From 2385395ed566948612a92e8b36d1c841f6ec6ba5 Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Wed, 3 Jan 2024 01:19:24 +0100
Subject: [PATCH 22/33] fix: XML Documentation (#14023)

---
 .../Media/StreamGeometryContext.cs            | 64 ++++++-------------
 .../Platform/IGeometryContext.cs              | 20 +++---
 .../Platform/PathGeometryContext.cs           | 19 ++++--
 3 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/src/Avalonia.Base/Media/StreamGeometryContext.cs b/src/Avalonia.Base/Media/StreamGeometryContext.cs
index 8b51bf3676..66fb65a6c2 100644
--- a/src/Avalonia.Base/Media/StreamGeometryContext.cs
+++ b/src/Avalonia.Base/Media/StreamGeometryContext.cs
@@ -29,22 +29,13 @@ namespace Avalonia.Media
         /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure. If you wonder why, ask Direct2D guys about their design decisions.
         /// </summary>
         /// <param name="fillRule"></param>
-
         public void SetFillRule(FillRule fillRule)
         {
             _impl.SetFillRule(fillRule);
         }
 
-        /// <summary>
-        /// Draws an arc to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
-        /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
-        /// <param name="isLargeArc">true to draw the arc greater than 180 degrees; otherwise, false.</param>
-        /// <param name="sweepDirection">
-        /// A value that indicates whether the arc is drawn in the Clockwise or Counterclockwise direction.
-        /// </param>
+
+        /// <inheritdoc/>
         public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
         {
             _impl.ArcTo(point, size, rotationAngle, isLargeArc, sweepDirection);
@@ -54,8 +45,8 @@ namespace Avalonia.Media
 
         /// <summary>
         /// Draws an arc to the specified point using polylines, quadratic or cubic Bezier curves
-        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.        
-        /// </summary>         
+        /// Significantly more precise when drawing elliptic arcs with extreme width:height ratios.
+        /// </summary>
         /// <param name="point">The destination point.</param>
         /// <param name="size">The radii of an oval whose perimeter is used to draw the angle.</param>
         /// <param name="rotationAngle">The rotation angle (in radians) of the oval that specifies the curve.</param>
@@ -68,54 +59,37 @@ namespace Avalonia.Media
             PreciseEllipticArcHelper.ArcTo(this, _currentPoint, point, size, rotationAngle, isLargeArc, sweepDirection);
         }
 
-        /// <summary>
-        /// Begins a new figure.
-        /// </summary>
-        /// <param name="startPoint">The starting point for the figure.</param>
-        /// <param name="isFilled">Whether the figure is filled.</param>
+
+        /// <inheritdoc/>
         public void BeginFigure(Point startPoint, bool isFilled)
         {
             _impl.BeginFigure(startPoint, isFilled);
             _currentPoint = startPoint;
         }
 
-        /// <summary>
-        /// Draws a Bezier curve to the specified point.
-        /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        public void CubicBezierTo(Point point1, Point point2, Point point3)
+        /// <inheritdoc/>
+        public void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint)
         {
-            _impl.CubicBezierTo(point1, point2, point3);
-            _currentPoint = point3;
+            _impl.CubicBezierTo(controlPoint1, controlPoint2, endPoint);
+            _currentPoint = endPoint;
         }
 
-        /// <summary>
-        /// Draws a quadratic Bezier curve to the specified point
-        /// </summary>
-        /// <param name="control">The control point used to specify the shape of the curve.</param>
-        /// <param name="endPoint">The destination point for the end of the curve.</param>
-        public void QuadraticBezierTo(Point control, Point endPoint)
+        /// <inheritdoc/>
+        public void QuadraticBezierTo(Point controlPoint , Point endPoint)
         {
-            _impl.QuadraticBezierTo(control, endPoint);
+            _impl.QuadraticBezierTo(controlPoint , endPoint);
             _currentPoint = endPoint;
         }
 
-        /// <summary>
-        /// Draws a line to the specified point.
-        /// </summary>
-        /// <param name="point">The destination point.</param>
-        public void LineTo(Point point)
+
+        /// <inheritdoc/>
+        public void LineTo(Point endPoint)
         {
-            _impl.LineTo(point);
-            _currentPoint = point;
+            _impl.LineTo(endPoint);
+            _currentPoint = endPoint;
         }
 
-        /// <summary>
-        /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
-        /// </summary>
-        /// <param name="isClosed">Whether the figure is closed.</param>
+        /// <inheritdoc/>
         public void EndFigure(bool isClosed)
         {
             _impl.EndFigure(isClosed);
diff --git a/src/Avalonia.Base/Platform/IGeometryContext.cs b/src/Avalonia.Base/Platform/IGeometryContext.cs
index 87db9f1dd4..614b331761 100644
--- a/src/Avalonia.Base/Platform/IGeometryContext.cs
+++ b/src/Avalonia.Base/Platform/IGeometryContext.cs
@@ -30,23 +30,23 @@ namespace Avalonia.Platform
         /// <summary>
         /// Draws a Bezier curve to the specified point.
         /// </summary>
-        /// <param name="point1">The first control point used to specify the shape of the curve.</param>
-        /// <param name="point2">The second control point used to specify the shape of the curve.</param>
-        /// <param name="point3">The destination point for the end of the curve.</param>
-        void CubicBezierTo(Point point1, Point point2, Point point3);
+        /// <param name="controlPoint1">The first control point used to specify the shape of the curve.</param>
+        /// <param name="controlPoint2">The second control point used to specify the shape of the curve.</param>
+        /// <param name="endPoint">The destination point for the end of the curve.</param>
+        void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint);
 
         /// <summary>
         /// Draws a quadratic Bezier curve to the specified point
         /// </summary>
-        /// <param name="control">Control point</param>
+        /// <param name="controlPoint ">Control point</param>
         /// <param name="endPoint">DestinationPoint</param>
-        void QuadraticBezierTo(Point control, Point endPoint);
+        void QuadraticBezierTo(Point controlPoint , Point endPoint);
 
         /// <summary>
         /// Draws a line to the specified point.
         /// </summary>
-        /// <param name="point">The destination point.</param>
-        void LineTo(Point point);
+        /// <param name="endPoint">The destination point.</param>
+        void LineTo(Point endPoint);
 
         /// <summary>
         /// Ends the figure started by <see cref="BeginFigure(Point, bool)"/>.
@@ -55,9 +55,9 @@ namespace Avalonia.Platform
         void EndFigure(bool isClosed);
 
         /// <summary>
-        /// Sets the fill rule.
+        /// Sets path's winding rule (default is EvenOdd). You should call this method before any calls to BeginFigure.
         /// </summary>
-        /// <param name="fillRule">The fill rule.</param>
+        /// <param name="fillRule"></param>
         void SetFillRule(FillRule fillRule);
     }
 }
diff --git a/src/Avalonia.Base/Platform/PathGeometryContext.cs b/src/Avalonia.Base/Platform/PathGeometryContext.cs
index 694e9f8d80..bcb4f2a272 100644
--- a/src/Avalonia.Base/Platform/PathGeometryContext.cs
+++ b/src/Avalonia.Base/Platform/PathGeometryContext.cs
@@ -20,6 +20,7 @@ namespace Avalonia.Visuals.Platform
             _pathGeometry = null;
         }
 
+        /// <inheritdoc/>
         public void ArcTo(Point point, Size size, double rotationAngle, bool isLargeArc, SweepDirection sweepDirection)
         {
             var arcSegment = new ArcSegment
@@ -34,6 +35,7 @@ namespace Avalonia.Visuals.Platform
             CurrentFigureSegments().Add(arcSegment);
         }
 
+        /// <inheritdoc/>
         public void BeginFigure(Point startPoint, bool isFilled)
         {
             ThrowIfDisposed();
@@ -44,30 +46,34 @@ namespace Avalonia.Visuals.Platform
             _pathGeometry.Figures.Add(_currentFigure);
         }
 
-        public void CubicBezierTo(Point point1, Point point2, Point point3)
+        /// <inheritdoc/>
+        public void CubicBezierTo(Point controlPoint1, Point controlPoint2, Point endPoint)
         {
-            var bezierSegment = new BezierSegment { Point1 = point1, Point2 = point2, Point3 = point3 };
+            var bezierSegment = new BezierSegment { Point1 = controlPoint1, Point2 = controlPoint2, Point3 = endPoint };
 
             CurrentFigureSegments().Add(bezierSegment);
         }
 
-        public void QuadraticBezierTo(Point control, Point endPoint)
+        /// <inheritdoc/>
+        public void QuadraticBezierTo(Point controlPoint , Point endPoint)
         {
-            var quadraticBezierSegment = new QuadraticBezierSegment { Point1 = control, Point2 = endPoint };
+            var quadraticBezierSegment = new QuadraticBezierSegment { Point1 = controlPoint , Point2 = endPoint };
 
             CurrentFigureSegments().Add(quadraticBezierSegment);
         }
 
-        public void LineTo(Point point)
+        /// <inheritdoc/>
+        public void LineTo(Point endPoint)
         {
             var lineSegment = new LineSegment
             {
-                Point = point
+                Point = endPoint
             };
 
             CurrentFigureSegments().Add(lineSegment);
         }
 
+        /// <inheritdoc/>
         public void EndFigure(bool isClosed)
         {
             if (_currentFigure != null)
@@ -78,6 +84,7 @@ namespace Avalonia.Visuals.Platform
             _currentFigure = null;
         }
 
+        /// <inheritdoc/>
         public void SetFillRule(FillRule fillRule)
         {
             ThrowIfDisposed();

From acc9f03e34d12ac6f3f1a2196b2aa14d8d135a73 Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Wed, 3 Jan 2024 08:58:20 +0100
Subject: [PATCH 23/33] feat(DevTools): Add LaunchView property to
 DevToolsOptions (#14008)

* feat(DevTools): Add LaunchView property to DevToolsOptions

Allow set the initial diagnostic view when launch DevTools

* fix: Address review
---
 .../Diagnostics/DevToolsOptions.cs            |  5 +++++
 .../Diagnostics/DevToolsViewKind.cs           | 20 +++++++++++++++++++
 .../Diagnostics/ViewModels/MainViewModel.cs   |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 src/Avalonia.Diagnostics/Diagnostics/DevToolsViewKind.cs

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 909c2baa9c..b2d1ab98c9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -52,5 +52,10 @@ namespace Avalonia.Diagnostics
         /// Get or set Focus Highlighter <see cref="Brush"/>
         /// </summary>
         public IBrush? FocusHighlighterBrush { get; set; }
+
+        /// <summary>
+        /// Set the <see cref="DevToolsViewKind">kind</see> of diagnostic view that show at launch of DevTools
+        /// </summary>
+        public DevToolsViewKind LaunchView { get; init; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsViewKind.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsViewKind.cs
new file mode 100644
index 0000000000..f7cf23be86
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsViewKind.cs
@@ -0,0 +1,20 @@
+namespace Avalonia.Diagnostics;
+
+/// <summary>
+/// Kinds of diagnostic views available in DevTools
+/// </summary>
+public enum DevToolsViewKind
+{
+    /// <summary>
+    /// The Logical Tree diagnostic view
+    /// </summary>
+    LogicalTree,
+    /// <summary>
+    /// The Visual Tree diagnostic view
+    /// </summary>
+    VisualTree,
+    /// <summary>
+    /// Events diagnostic view
+    /// </summary>
+    Events,
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index 4cb4162af5..5daa480702 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -338,6 +338,7 @@ namespace Avalonia.Diagnostics.ViewModels
             StartupScreenIndex = options.StartupScreenIndex;
             ShowImplementedInterfaces = options.ShowImplementedInterfaces;
             FocusHighlighter = options.FocusHighlighterBrush;
+            SelectedTab = (int)options.LaunchView;
         }
 
         public bool ShowImplementedInterfaces

From 72887ce2946ed3743f7511c861493cfc17634c29 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Jan 2024 03:43:27 -0800
Subject: [PATCH 24/33] Do not crash on IsCurrent checks (#14089)

---
 src/Avalonia.OpenGL/Egl/EglContext.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.OpenGL/Egl/EglContext.cs b/src/Avalonia.OpenGL/Egl/EglContext.cs
index 137e9a18d3..ae729968ba 100644
--- a/src/Avalonia.OpenGL/Egl/EglContext.cs
+++ b/src/Avalonia.OpenGL/Egl/EglContext.cs
@@ -154,7 +154,7 @@ namespace Avalonia.OpenGL.Egl
                 ShareWith = _sharedWith ?? this
             });
 
-        public bool IsCurrent => _egl.GetCurrentDisplay() == _disp.Handle && _egl.GetCurrentContext() == Context;
+        public bool IsCurrent => _context != default && _egl.GetCurrentDisplay() == _disp.Handle && _egl.GetCurrentContext() == _context;
 
         public void Dispose()
         {

From 00e9a3da3463b8bcf3c166810452461ad70014a5 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 3 Jan 2024 07:19:07 -0800
Subject: [PATCH 25/33] Implement ApiInformation checks (#14090)

* Create wrapper for IApiInformationStatics

* Use ApiInformation APIs to get if WinRT types are supported

* Add some docs
---
 .../Avalonia.Win32/Input/WindowsInputPane.cs  |  17 +-
 .../Avalonia.Win32/Win32PlatformSettings.cs   |   6 +-
 .../WinRT/WinRTApiInformation.cs              | 160 ++++++++++++++++++
 src/Windows/Avalonia.Win32/WinRT/winrt.idl    |  14 ++
 src/Windows/Avalonia.Win32/WindowImpl.cs      |   2 +-
 5 files changed, 196 insertions(+), 3 deletions(-)
 create mode 100644 src/Windows/Avalonia.Win32/WinRT/WinRTApiInformation.cs

diff --git a/src/Windows/Avalonia.Win32/Input/WindowsInputPane.cs b/src/Windows/Avalonia.Win32/Input/WindowsInputPane.cs
index f8035eaf00..f21f0e054d 100644
--- a/src/Windows/Avalonia.Win32/Input/WindowsInputPane.cs
+++ b/src/Windows/Avalonia.Win32/Input/WindowsInputPane.cs
@@ -3,11 +3,15 @@ using Avalonia.Controls.Platform;
 using Avalonia.MicroCom;
 using Avalonia.Win32.Interop;
 using Avalonia.Win32.Win32Com;
+using Avalonia.Win32.WinRT;
 
 namespace Avalonia.Win32.Input;
 
 internal unsafe class WindowsInputPane : IInputPane, IDisposable
 {
+    private static readonly Lazy<bool> s_inputPaneSupported = new(() =>
+        WinRTApiInformation.IsTypePresent("Windows.UI.ViewManagement.InputPane")); 
+
     // GUID: D5120AA3-46BA-44C5-822D-CA8092C1FC72
     private static readonly Guid CLSID_FrameworkInputPane = new(0xD5120AA3, 0x46BA, 0x44C5, 0x82, 0x2D, 0xCA, 0x80, 0x92, 0xC1, 0xFC, 0x72);
     // GUID: 5752238B-24F0-495A-82F1-2FD593056796
@@ -17,7 +21,7 @@ internal unsafe class WindowsInputPane : IInputPane, IDisposable
     private readonly IFrameworkInputPane _inputPane;
     private readonly uint _cookie;
 
-    public WindowsInputPane(WindowImpl windowImpl)
+    private WindowsInputPane(WindowImpl windowImpl)
     {
         _windowImpl = windowImpl;
         _inputPane = UnmanagedMethods.CreateInstance<IFrameworkInputPane>(in CLSID_FrameworkInputPane, in SID_IFrameworkInputPane);
@@ -29,6 +33,17 @@ internal unsafe class WindowsInputPane : IInputPane, IDisposable
             _cookie = cookie;
         }
     }
+
+    public static WindowsInputPane? TryCreate(WindowImpl windowImpl)
+    {
+        if (s_inputPaneSupported.Value)
+        {
+            return new WindowsInputPane(windowImpl);
+        }
+
+        return null;
+    }
+    
     public InputPaneState State { get; private set; }
 
     public Rect OccludedRect { get; private set; }
diff --git a/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs b/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs
index c5f7f17b32..0372979824 100644
--- a/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs
+++ b/src/Windows/Avalonia.Win32/Win32PlatformSettings.cs
@@ -8,6 +8,10 @@ namespace Avalonia.Win32;
 
 internal class Win32PlatformSettings : DefaultPlatformSettings
 {
+    private static readonly Lazy<bool> s_uiSettingsSupported = new(() =>
+        WinRTApiInformation.IsTypePresent("Windows.UI.ViewManagement.UISettings")
+        && WinRTApiInformation.IsTypePresent("Windows.UI.ViewManagement.AccessibilitySettings")); 
+
     private PlatformColorValues? _lastColorValues;
 
     public override Size GetTapSize(PointerType type)
@@ -32,7 +36,7 @@ internal class Win32PlatformSettings : DefaultPlatformSettings
     
     public override PlatformColorValues GetColorValues()
     {
-        if (Win32Platform.WindowsVersion.Major < 10)
+        if (!s_uiSettingsSupported.Value)
         {
             return base.GetColorValues();
         }
diff --git a/src/Windows/Avalonia.Win32/WinRT/WinRTApiInformation.cs b/src/Windows/Avalonia.Win32/WinRT/WinRTApiInformation.cs
new file mode 100644
index 0000000000..2c59257c74
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/WinRT/WinRTApiInformation.cs
@@ -0,0 +1,160 @@
+using System;
+using Avalonia.Logging;
+using MicroCom.Runtime;
+
+namespace Avalonia.Win32.WinRT;
+
+/// <summary>
+/// Any WinRT API might not be available even if Windows version is supposed to support them (Win PE, Xbox...).
+/// Using ApiInformation is a typical solution in UWP/WinUI apps, so we should do as well.
+/// </summary>
+internal static unsafe class WinRTApiInformation
+{
+    private static readonly Lazy<IApiInformationStatics?> s_statics = new(() =>
+    {
+        if (Win32Platform.WindowsVersion.Major < 10)
+        {
+            return null;
+        }
+
+        try
+        {
+            using var apiStatics = NativeWinRTMethods.CreateActivationFactory<IApiInformationStatics>(
+                "Windows.Foundation.Metadata.ApiInformation");
+            return apiStatics.CloneReference();
+        }
+        catch (Exception ex)
+        {
+            Logger.TryGet(LogEventLevel.Warning, LogArea.Win32Platform)?
+                .Log(null, "Unable to create ApiInformation instance: {0}", ex);
+            return null;
+        }
+    });
+
+    public static bool IsTypePresent(string typeName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        var result = 0;
+        if (s_statics.Value?.IsTypePresent(typeNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsMethodPresent(string typeName, string methodName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var methodNamePtr = new HStringInterop(methodName);
+        var result = 0;
+        if (s_statics.Value?.IsMethodPresent(typeNamePtr.Handle, methodNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsMethodPresentWithArity(string typeName, string methodName, uint inputParameterCount)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var methodNamePtr = new HStringInterop(methodName);
+        var result = 0;
+        if (s_statics.Value?.IsMethodPresentWithArity(typeNamePtr.Handle, methodNamePtr.Handle, inputParameterCount, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsEventPresent(string typeName, string eventName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var eventNamePtr = new HStringInterop(eventName);
+        var result = 0;
+        if (s_statics.Value?.IsEventPresent(typeNamePtr.Handle, eventNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsPropertyPresent(string typeName, string propertyName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var propertyNamePtr = new HStringInterop(propertyName);
+        var result = 0;
+        if (s_statics.Value?.IsPropertyPresent(typeNamePtr.Handle, propertyNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsReadOnlyPropertyPresent(string typeName, string propertyName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var propertyNamePtr = new HStringInterop(propertyName);
+        var result = 0;
+        if (s_statics.Value?.IsReadOnlyPropertyPresent(typeNamePtr.Handle, propertyNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsWriteablePropertyPresent(string typeName, string propertyName)
+    {
+        using var typeNamePtr = new HStringInterop(typeName);
+        using var propertyNamePtr = new HStringInterop(propertyName);
+        var result = 0;
+        if (s_statics.Value?.IsWriteablePropertyPresent(typeNamePtr.Handle, propertyNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsEnumNamedValuePresent(string enumTypeName, string valueName)
+    {
+        using var enumTypeNamePtr = new HStringInterop(enumTypeName);
+        using var valueNamePtr = new HStringInterop(valueName);
+        var result = 0;
+        if (s_statics.Value?.IsEnumNamedValuePresent(enumTypeNamePtr.Handle, valueNamePtr.Handle, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsApiContractPresentByMajor(string contractName, ushort majorVersion)
+    {
+        using var contractNamePtr = new HStringInterop(contractName);
+        var result = 0;
+        if (s_statics.Value?.IsApiContractPresentByMajor(contractNamePtr.Handle, majorVersion, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+
+    public static bool IsApiContractPresentByMajorAndMinor(string contractName, ushort majorVersion, ushort minorVersion)
+    {
+        using var contractNamePtr = new HStringInterop(contractName);
+        var result = 0;
+        if (s_statics.Value?.IsApiContractPresentByMajorAndMinor(contractNamePtr.Handle, majorVersion, minorVersion, &result) == 0)
+        {
+            return result == 1;
+        }
+
+        return false;
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/WinRT/winrt.idl b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
index 03b38d0e68..b80a0de11b 100644
--- a/src/Windows/Avalonia.Win32/WinRT/winrt.idl
+++ b/src/Windows/Avalonia.Win32/WinRT/winrt.idl
@@ -872,3 +872,17 @@ interface IAccessibilitySettings : IInspectable
     [propget] HRESULT HighContrastScheme([out] [retval] HSTRING* value);
 }
 
+[uuid(997439FE-F681-4A11-B416-C13A47E8BA36)]
+interface IApiInformationStatics : IInspectable
+{
+    int IsTypePresent(HSTRING typeName, boolean* result);
+    int IsMethodPresent(HSTRING typeName, HSTRING methodName, boolean* result);
+    int IsMethodPresentWithArity(HSTRING typeName, HSTRING methodName, UINT32 inputParameterCount, boolean* result);
+    int IsEventPresent(HSTRING typeName, HSTRING eventName, boolean* result);
+    int IsPropertyPresent(HSTRING typeName, HSTRING propertyName, boolean* result);
+    int IsReadOnlyPropertyPresent(HSTRING typeName, HSTRING propertyName, boolean* result);
+    int IsWriteablePropertyPresent(HSTRING typeName, HSTRING propertyName, boolean* result);
+    int IsEnumNamedValuePresent(HSTRING enumTypeName, HSTRING valueName, boolean* result);
+    int IsApiContractPresentByMajor(HSTRING contractName, UINT16 majorVersion, boolean* result);
+    int IsApiContractPresentByMajorAndMinor(HSTRING contractName, UINT16 majorVersion, UINT16 minorVersion, boolean* result);
+}
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 0c54f0fe6d..5651e3b509 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -165,7 +165,7 @@ namespace Avalonia.Win32
 
             Screen = new ScreenImpl();
             _storageProvider = new Win32StorageProvider(this);
-            _inputPane = Win32Platform.WindowsVersion >= PlatformConstants.Windows10 ? new WindowsInputPane(this) : null;
+            _inputPane = WindowsInputPane.TryCreate(this);
             _nativeControlHost = new Win32NativeControlHost(this, !UseRedirectionBitmap);
             _defaultTransparencyLevel = UseRedirectionBitmap ? WindowTransparencyLevel.None : WindowTransparencyLevel.Transparent;
             _transparencyLevel = _defaultTransparencyLevel;

From 38e839997d2c204548e6fad396c178780a010cb1 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 4 Jan 2024 09:16:39 -0800
Subject: [PATCH 26/33] Avoid hardcoded font properties (#14088)

* Avoid hardcoded FontSize and other Font properties that can be inherited

* Avoid TemplateBinding, when Font property can be inherited

* Improve Calendar font customization a little

* Opps
---
 .../Accents/FluentControlResources.xaml        |  6 ++++++
 .../Controls/AutoCompleteBox.xaml              |  4 ----
 .../Controls/ButtonSpinner.xaml                |  3 ---
 .../Controls/Calendar.xaml                     |  1 +
 .../Controls/CalendarButton.xaml               |  4 +---
 .../Controls/CalendarDayButton.xaml            |  2 --
 .../Controls/CalendarItem.xaml                 |  3 +--
 .../Controls/CheckBox.xaml                     |  1 -
 .../Controls/ComboBox.xaml                     |  1 -
 .../Controls/ContextMenu.xaml                  |  2 --
 .../Controls/DatePicker.xaml                   | 18 +++---------------
 .../Controls/HeaderedContentControl.xaml       |  8 --------
 .../Controls/ListBox.xaml                      |  1 -
 .../Controls/ListBoxItem.xaml                  |  5 -----
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml  |  1 -
 .../Controls/MenuItem.xaml                     |  1 -
 .../Controls/NotificationCard.xaml             |  1 -
 .../Controls/NumericUpDown.xaml                |  2 --
 .../Controls/OverlayPopupHost.xaml             |  2 +-
 .../Controls/PopupRoot.xaml                    |  2 +-
 .../Controls/RadioButton.xaml                  |  1 -
 .../Controls/RepeatButton.xaml                 |  2 --
 .../Controls/Slider.xaml                       |  1 -
 .../Controls/SplitButton.xaml                  |  3 ---
 .../Controls/TabItem.xaml                      |  5 +----
 .../Controls/TabStripItem.xaml                 |  5 +----
 .../Controls/TextBox.xaml                      |  2 --
 .../Controls/ThemeVariantScope.xaml            |  2 --
 .../Controls/TimePicker.xaml                   | 17 +++--------------
 .../Controls/ToggleButton.xaml                 |  2 --
 .../Controls/ToggleSwitch.xaml                 |  1 -
 .../DensityStyles/Compact.xaml                 |  1 -
 .../Controls/NotificationCard.xaml             |  2 +-
 .../Controls/ThemeVariantScope.xaml            |  1 -
 34 files changed, 20 insertions(+), 93 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml b/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml
index c906827e50..c38599f171 100644
--- a/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/FluentControlResources.xaml
@@ -385,6 +385,9 @@
       <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver"
                       ResourceKey="SystemControlHighlightTransparentBrush" />
       <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+      <x:Double x:Key="CalendarFontSize">20</x:Double>
+      <x:Double x:Key="CalendarDayButtonFontSize">12</x:Double>
+      <FontWeight x:Key="CalendarViewTodayFontWeight">SemiBold</FontWeight>
 
       <!-- Resources for Expander.xaml -->
       <!-- Expander:Header -->
@@ -1180,6 +1183,9 @@
       <StaticResource x:Key="CalendarViewNavigationButtonBorderBrushPointerOver"
                       ResourceKey="SystemControlHighlightTransparentBrush" />
       <StaticResource x:Key="CalendarViewNavigationButtonBorderBrush" ResourceKey="SystemControlTransparentBrush" />
+      <x:Double x:Key="CalendarFontSize">20</x:Double>
+      <x:Double x:Key="CalendarDayButtonFontSize">12</x:Double>
+      <FontWeight x:Key="CalendarViewTodayFontWeight">SemiBold</FontWeight>
 
       <!-- Resources for Expander.xaml -->
       <!-- Expander:Header -->
diff --git a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
index 083d90b010..5ade49fab0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/AutoCompleteBox.xaml
@@ -28,7 +28,6 @@
       <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
       <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
       <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-      <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
       <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
       <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteListMaxHeight}" />
       <Setter Property="Template">
@@ -43,9 +42,6 @@
                      BorderThickness="{TemplateBinding BorderThickness}"
                      CornerRadius="{TemplateBinding CornerRadius}"
                      CaretIndex="{TemplateBinding CaretIndex, Mode=TwoWay}"
-                     FontSize="{TemplateBinding FontSize}"
-                     FontFamily="{TemplateBinding FontFamily}"
-                     FontWeight="{TemplateBinding FontWeight}"
                      Padding="{TemplateBinding Padding}"
                      Margin="0"
                      DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index 095e801d0c..a03366ab0a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -79,7 +79,6 @@
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Focusable" Value="True"/>
@@ -104,7 +103,6 @@
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
                               Foreground="{TemplateBinding Foreground}"
-                              FontSize="{TemplateBinding FontSize}"
                               MinWidth="34">
                   <PathIcon Width="16"
                             Height="8"
@@ -119,7 +117,6 @@
                               VerticalAlignment="Stretch"
                               VerticalContentAlignment="Center"
                               Foreground="{TemplateBinding Foreground}"
-                              FontSize="{TemplateBinding FontSize}"
                               MinWidth="34">
                   <PathIcon Width="16"
                             Height="8"
diff --git a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
index 2f4a444529..713bff0091 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Calendar.xaml
@@ -21,6 +21,7 @@
     <Setter Property="BorderThickness" Value="1" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="FontSize" Value="{DynamicResource CalendarFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
         <StackPanel
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 206973b7ee..0d70bc4db6 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -26,7 +26,6 @@
     <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
     <Setter Property="BorderThickness" Value="2" />
-    <Setter Property="FontSize" Value="20" />
     <Setter Property="ClipToBounds" Value="False" />
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -41,7 +40,6 @@
                               Content="{TemplateBinding Content}"
                               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
                               Margin="{TemplateBinding Padding}" />
           </Border>
 
@@ -73,7 +71,7 @@
 
       <Style Selector="^ /template/ ContentPresenter#Content">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="FontWeight" Value="{DynamicResource CalendarViewTodayFontWeight}" />
       </Style>
 
       <Style Selector="^:pointerover">
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
index 904a234ada..31280c6320 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarDayButton.xaml
@@ -26,7 +26,6 @@
     <Setter Property="Background" Value="{DynamicResource CalendarViewCalendarItemRevealBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewCalendarItemRevealBorderBrush}" />
     <Setter Property="BorderThickness" Value="2" />
-    <Setter Property="FontSize" Value="20" />
     <Setter Property="ClipToBounds" Value="False" />
     <Setter Property="HorizontalContentAlignment" Value="Center" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -42,7 +41,6 @@
                             Content="{TemplateBinding Content}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
                             Margin="{TemplateBinding Padding}" />
 
           </Border>
diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
index 3bbef81695..ead55ac950 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarItem.xaml
@@ -27,7 +27,6 @@
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="VerticalAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="20" />
     <Setter Property="Background" Value="{DynamicResource CalendarViewNavigationButtonBackground}" />
     <Setter Property="Template">
       <ControlTemplate>
@@ -61,7 +60,7 @@
         <TextBlock Text="{Binding}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
-                   FontSize="12" />
+                   FontSize="{DynamicResource CalendarDayButtonFontSize}" />
       </Template>
     </Setter>
 
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index fc0a8c7c66..85a6489e06 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -18,7 +18,6 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="MinHeight" Value="32" />
     <Setter Property="Foreground" Value="{DynamicResource CheckBoxForegroundUnchecked}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
index cc472fd72f..5efe6f1790 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml
@@ -53,7 +53,6 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="PlaceholderForeground" Value="{DynamicResource ComboBoxPlaceHolderForeground}" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
index c8e2873eb6..c4a93ccb19 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ContextMenu.xaml
@@ -42,8 +42,6 @@
     <Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
     <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="TextBlock.FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="TextBlock.FontWeight" Value="Normal" />
     <Setter Property="WindowManagerAddShadowHint" Value="False" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 58f181bd23..49f8174791 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -72,7 +72,6 @@
   </ControlTheme>
   
   <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker">
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource DatePickerButtonForeground}" />
     <Setter Property="Background" Value="{DynamicResource DatePickerButtonBackground}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource DatePickerButtonBorderBrush}"/>
@@ -99,20 +98,11 @@
                     TemplatedControl.IsTemplateFocusTarget="True">
               <Grid Name="PART_ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
                 <TextBlock Name="PART_DayTextBlock" Text="day" HorizontalAlignment="Center"
-                           Padding="{DynamicResource DatePickerHostPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
+                           Padding="{DynamicResource DatePickerHostPadding}"/>
                 <TextBlock Name="PART_MonthTextBlock" Text="month" TextAlignment="Left"
-                           Padding="{DynamicResource DatePickerHostMonthPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
+                           Padding="{DynamicResource DatePickerHostMonthPadding}"/>
                 <TextBlock Name="PART_YearTextBlock" Text="year" HorizontalAlignment="Center"
-                           Padding="{DynamicResource DatePickerHostPadding}"
-                           FontFamily="{TemplateBinding FontFamily}"
-                           FontWeight="{TemplateBinding FontWeight}"
-                           FontSize="{TemplateBinding FontSize}"/>
+                           Padding="{DynamicResource DatePickerHostPadding}"/>
                 <Rectangle x:Name="PART_FirstSpacer"
                       Fill="{DynamicResource DatePickerSpacerFill}"
                       HorizontalAlignment="Center"
@@ -156,8 +146,6 @@
     <Setter Property="Width" Value="296" />
     <Setter Property="MinWidth" Value="296" />
     <Setter Property="MaxHeight" Value="398" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Background" Value="{DynamicResource DatePickerFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource DatePickerFlyoutPresenterBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
index 5b306a831d..d2ccf2b0c1 100644
--- a/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
@@ -19,10 +19,6 @@
                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
-                              FontWeight="{TemplateBinding FontWeight}"
-                              FontFamily="{TemplateBinding FontFamily}"
-                              FontStyle="{TemplateBinding FontStyle}"
                               Grid.Row="0" />
             <ContentPresenter Name="PART_ContentPresenter"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
@@ -30,10 +26,6 @@
                               RecognizesAccessKey="True"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              FontSize="{TemplateBinding FontSize}"
-                              FontWeight="{TemplateBinding FontWeight}"
-                              FontFamily="{TemplateBinding FontFamily}"
-                              FontStyle="{TemplateBinding FontStyle}"
                               Grid.Row="1" />
           </Grid>
         </Border>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
index 886846a589..d777520ecf 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBox.xaml
@@ -21,7 +21,6 @@
     <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
     <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
     <Setter Property="ScrollViewer.IsScrollInertiaEnabled" Value="True" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
index 024c379c11..5388344b4f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ListBoxItem.xaml
@@ -14,12 +14,9 @@
     </Border>
   </Design.PreviewWith>
   <Thickness x:Key="ListBoxItemPadding">12,9,12,12</Thickness>
-  <FontWeight x:Key="ListBoxItemFontWeight">Normal</FontWeight>
   <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="Padding" Value="{DynamicResource ListBoxItemPadding}" />
-    <Setter Property="FontWeight" Value="{DynamicResource ListBoxItemFontWeight}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
         <ContentPresenter Name="PART_ContentPresenter"
@@ -29,8 +26,6 @@
                           CornerRadius="{TemplateBinding CornerRadius}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
-                          FontWeight="{TemplateBinding FontWeight}"
-                          FontSize="{TemplateBinding FontSize}"
                           Padding="{TemplateBinding Padding}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index c1640efa8c..2d326c36f4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -17,7 +17,6 @@
     <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackground}" />
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
     <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource MenuBarItemPadding}" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 1052a20ee9..dff1e5961e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -60,7 +60,6 @@
     <Setter Property="Foreground" Value="{DynamicResource MenuFlyoutItemForeground}" />
     <!--  Narrow padding should be used for mouse input, when non-narrow one should be used for touch input in future.  -->
     <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
index 52e7280c95..9250b8e42d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NotificationCard.xaml
@@ -9,7 +9,6 @@
   <ControlTheme x:Key="{x:Type NotificationCard}" TargetType="NotificationCard">
     <Setter Property="UseLayoutRounding" Value="True"/>
     <Setter Property="Width" Value="350"/>
-    <Setter Property="FontSize" Value="14"/>
     <Setter Property="Foreground" Value="{DynamicResource NotificationCardForegroundBrush}"/>
     <Setter Property="RenderTransformOrigin" Value="50%,75%"/>
     <Setter Property="BorderThickness" Value="0" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
index a470eb1d3b..512241264d 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NumericUpDown.xaml
@@ -26,7 +26,6 @@
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
     <Setter Property="Template">
@@ -51,7 +50,6 @@
                    Padding="{TemplateBinding Padding}"
                    MinWidth="0"
                    Foreground="{TemplateBinding Foreground}"
-                   FontSize="{TemplateBinding FontSize}"
                    Watermark="{TemplateBinding Watermark}"
                    IsReadOnly="{TemplateBinding IsReadOnly}"
                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
index 1316a5bd65..598ec994fc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/OverlayPopupHost.xaml
@@ -5,7 +5,7 @@
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontStyle" Value="Normal" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
index 910c5f8d8c..e818b4c382 100644
--- a/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/PopupRoot.xaml
@@ -7,7 +7,7 @@
     <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-    <Setter Property="FontWeight" Value="400" />
+    <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="FontStyle" Value="Normal" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index 39f89788bb..f680318b74 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -21,7 +21,6 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Template">
       <ControlTemplate TargetType="RadioButton">
         <Border
diff --git a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
index b8a06f996a..2d19ec79ee 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RepeatButton.xaml
@@ -20,8 +20,6 @@
     <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Template">
       <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index a4102a84d3..5834df311c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -91,7 +91,6 @@
     <Setter Property="Background" Value="{DynamicResource SliderTrackFill}" />
     <Setter Property="BorderThickness" Value="{DynamicResource SliderBorderThemeThickness}" />
     <Setter Property="Foreground" Value="{DynamicResource SliderTrackValueFill}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Style Selector="^:horizontal">
       <Setter Property="Template">
         <ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index 98f8c8238e..0550de16a3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -150,9 +150,6 @@
                   Command="{TemplateBinding Command}"
                   CommandParameter="{TemplateBinding CommandParameter}"
                   CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource LeftCornerRadiusFilterConverter}}"
-                  FontFamily="{TemplateBinding FontFamily}"
-                  FontSize="{TemplateBinding FontSize}"
-                  FontWeight="{TemplateBinding FontWeight}"
                   HorizontalAlignment="Stretch"
                   VerticalAlignment="Stretch"
                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 54eea85743..ce3cecb0c0 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -40,10 +40,7 @@
                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                 Content="{TemplateBinding Header}"
-                ContentTemplate="{TemplateBinding HeaderTemplate}"
-                FontFamily="{TemplateBinding FontFamily}"
-                FontSize="{TemplateBinding FontSize}"
-                FontWeight="{TemplateBinding FontWeight}" />
+                ContentTemplate="{TemplateBinding HeaderTemplate}" />
             <Border Name="PART_SelectedPipe"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
                     CornerRadius="{DynamicResource ControlCornerRadius}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
index 9c8584f7e5..b9b0fc6026 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabStripItem.xaml
@@ -39,10 +39,7 @@
                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                 Content="{TemplateBinding Content}"
-                ContentTemplate="{TemplateBinding ContentTemplate}"
-                FontFamily="{TemplateBinding FontFamily}"
-                FontSize="{TemplateBinding FontSize}"
-                FontWeight="{TemplateBinding FontWeight}" />
+                ContentTemplate="{TemplateBinding ContentTemplate}" />
             <Border Name="PART_SelectedPipe"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
                     CornerRadius="{DynamicResource ControlCornerRadius}"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index 52600fa714..adac85997e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -101,7 +101,6 @@
     <Setter Property="SelectionBrush" Value="{DynamicResource TextControlSelectionHighlightColor}" />
     <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
@@ -134,7 +133,6 @@
                            Margin="{TemplateBinding Padding}">
                   <TextBlock Name="PART_FloatingWatermark"
                              Foreground="{DynamicResource SystemAccentColor}"
-                             FontSize="{TemplateBinding FontSize}"
                              IsVisible="False"
                              Text="{TemplateBinding Watermark}"
                              DockPanel.Dock="Top" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml b/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml
index 2e8715c9b9..6adc49493e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ThemeVariantScope.xaml
@@ -4,7 +4,5 @@
   <ControlTheme x:Key="{x:Type ThemeVariantScope}"
                 TargetType="ThemeVariantScope">
     <Setter Property="TextElement.Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}"/>
-    <Setter Property="TextElement.FontSize" Value="{DynamicResource ControlContentThemeFontSize}"/>
-    <Setter Property="TextElement.FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 5edfaaae1d..9f854f2f1e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -71,7 +71,6 @@
   </ControlTheme>
 
   <ControlTheme x:Key="{x:Type TimePicker}" TargetType="TimePicker">
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="Foreground" Value="{DynamicResource TimePickerButtonForeground}" />
     <Setter Property="Background" Value="{DynamicResource TimePickerButtonBackground}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource TimePickerButtonBorderBrush}"/>
@@ -104,10 +103,7 @@
                         VerticalAlignment="Stretch">
                   <TextBlock x:Name="PART_HourTextBlock"
                       HorizontalAlignment="Center"
-                      Padding="{DynamicResource TimePickerHostPadding}"
-                      FontFamily="{TemplateBinding FontFamily}"
-                      FontWeight="{TemplateBinding FontWeight}"
-                      FontSize="{TemplateBinding FontSize}" />
+                      Padding="{DynamicResource TimePickerHostPadding}" />
                 </Border>
 
                 <Rectangle Name="PART_FirstColumnDivider"
@@ -122,10 +118,7 @@
                         VerticalAlignment="Stretch">
                   <TextBlock x:Name="PART_MinuteTextBlock"
                              HorizontalAlignment="Center"
-                             Padding="{DynamicResource TimePickerHostPadding}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             FontSize="{TemplateBinding FontSize}"/>
+                             Padding="{DynamicResource TimePickerHostPadding}"/>
                 </Border>
 
                 <Rectangle Name="PART_SecondColumnDivider"
@@ -140,10 +133,7 @@
                         VerticalAlignment="Stretch">
                   <TextBlock x:Name="PART_PeriodTextBlock"
                              HorizontalAlignment="Center"
-                             Padding="{DynamicResource TimePickerHostPadding}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             FontSize="{TemplateBinding FontSize}" />
+                             Padding="{DynamicResource TimePickerHostPadding}" />
                 </Border>
               </Grid>
             </Button>
@@ -178,7 +168,6 @@
     <Setter Property="Width" Value="242" />
     <Setter Property="MinWidth" Value="242" />
     <Setter Property="MaxHeight" Value="398" />
-    <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="Background" Value="{DynamicResource TimePickerFlyoutPresenterBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TimePickerFlyoutPresenterBorderBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource DateTimeFlyoutBorderThickness}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index 1b54e6deaf..ddf3070cbc 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -20,8 +20,6 @@
     <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
     <Setter Property="HorizontalAlignment" Value="Left" />
     <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="RenderTransform" Value="none" />
     <Setter Property="Transitions">
       <Transitions>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index ff9de247f4..9a01290de4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -27,7 +27,6 @@
     <Setter Property="VerticalAlignment" Value="Center" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="KnobTransitions">
       <Transitions>
           <DoubleTransition
diff --git a/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
index 830198f6d1..8b37d2187f 100644
--- a/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
+++ b/src/Avalonia.Themes.Fluent/DensityStyles/Compact.xaml
@@ -2,7 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     x:ClassModifier="internal">
   <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>
-  <x:Double x:Key="ContentControlFontSize">14</x:Double>
   <x:Double x:Key="TextControlThemeMinHeight">24</x:Double>
   <x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
   <Thickness x:Key="TextControlThemePadding">4, 2</Thickness>
diff --git a/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml b/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
index 62e73a8dd0..9cd095566a 100644
--- a/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/NotificationCard.xaml
@@ -6,7 +6,7 @@
     <Setter Property="Background" Value="{DynamicResource NotificationCardBackgroundBrush}" />
     <Setter Property="UseLayoutRounding" Value="True" />
     <Setter Property="Width" Value="350" />
-    <Setter Property="FontSize" Value="14" />
+    <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}" />
     <Setter Property="Foreground" Value="White" />
     <Setter Property="RenderTransformOrigin" Value="50%,75%" />
     <Setter Property="Template">
diff --git a/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml b/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml
index 2eb157cf6b..f76009caea 100644
--- a/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ThemeVariantScope.xaml
@@ -4,6 +4,5 @@
   <ControlTheme x:Key="{x:Type ThemeVariantScope}"
                 TargetType="ThemeVariantScope">
     <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    <Setter Property="TextElement.FontSize" Value="{DynamicResource FontSizeNormal}" />
   </ControlTheme>
 </ResourceDictionary>

From 2c890e9b9c09a3f25cf553087189255661efbc33 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Mon, 8 Jan 2024 09:57:31 +0000
Subject: [PATCH 27/33] only clear held pointer reference if pointer event is
 raised (#14140)

---
 src/Avalonia.Base/Input/Gestures.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Base/Input/Gestures.cs b/src/Avalonia.Base/Input/Gestures.cs
index 53562d97c6..40981711a3 100644
--- a/src/Avalonia.Base/Input/Gestures.cs
+++ b/src/Avalonia.Base/Input/Gestures.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Input
 
         private static readonly WeakReference<object?> s_lastPress = new WeakReference<object?>(null);
         private static Point s_lastPressPoint;
-        private static IPointer? s_lastPointer;
+        private static IPointer? s_lastHeldPointer;
 
         public static readonly RoutedEvent<PinchEventArgs> PinchEvent =
             RoutedEvent.Register<PinchEventArgs>(
@@ -225,17 +225,17 @@ namespace Avalonia.Input
                 var e = (PointerPressedEventArgs)ev;
                 var visual = (Visual)ev.Source;
 
-                if(s_lastPointer != null)
+                if(s_lastHeldPointer != null)
                 {
                     if(s_isHolding && ev.Source is Interactive i)
                     {
-                        i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Cancelled, s_lastPressPoint, s_lastPointer.Type, e));
+                        i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Cancelled, s_lastPressPoint, s_lastHeldPointer.Type, e));
                     }
                     s_holdCancellationToken?.Cancel();
                     s_holdCancellationToken?.Dispose();
                     s_holdCancellationToken = null;
 
-                    s_lastPointer = null;
+                    s_lastHeldPointer = null;
                 }
 
                 s_isHolding = false;
@@ -244,7 +244,7 @@ namespace Avalonia.Input
                 {
                     s_isDoubleTapped = false;
                     s_lastPress.SetTarget(ev.Source);
-                    s_lastPointer = e.Pointer;
+                    s_lastHeldPointer = e.Pointer;
                     s_lastPressPoint = e.GetPosition((Visual)ev.Source);
                     s_holdCancellationToken = new CancellationTokenSource();
                     var token = s_holdCancellationToken.Token;
@@ -257,7 +257,7 @@ namespace Avalonia.Input
                             if (!token.IsCancellationRequested && e.Source is InputElement i && GetIsHoldingEnabled(i) && (e.Pointer.Type != PointerType.Mouse || GetIsHoldWithMouseEnabled(i)))
                             {
                                 s_isHolding = true;
-                                i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Started, s_lastPressPoint, s_lastPointer.Type, e));
+                                i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Started, s_lastPressPoint, s_lastHeldPointer.Type, e));
                             }
                         }, settings.HoldWaitDuration);
                     }
@@ -281,7 +281,7 @@ namespace Avalonia.Input
             {
                 var e = (PointerReleasedEventArgs)ev;
 
-                if (s_lastPress.TryGetTarget(out var target) && 
+                if (s_lastPress.TryGetTarget(out var target) &&
                     target == e.Source &&
                     e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right &&
                     e.Source is Interactive i)
@@ -294,10 +294,10 @@ namespace Avalonia.Input
 
                     if (tapRect.ContainsExclusive(point.Position))
                     {
-                        if(s_isHolding)
+                        if (s_isHolding)
                         {
                             s_isHolding = false;
-                            i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Completed, s_lastPressPoint, s_lastPointer!.Type, e));
+                            i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Completed, s_lastPressPoint, s_lastHeldPointer!.Type, e));
                         }
                         else if (e.InitialPressMouseButton == MouseButton.Right)
                         {
@@ -310,12 +310,12 @@ namespace Avalonia.Input
                             i.RaiseEvent(new TappedEventArgs(TappedEvent, e));
                         }
                     }
+                    s_lastHeldPointer = null;
                 }
 
                 s_holdCancellationToken?.Cancel();
                 s_holdCancellationToken?.Dispose();
                 s_holdCancellationToken = null;
-                s_lastPointer = null;
             }
         }
 
@@ -326,7 +326,7 @@ namespace Avalonia.Input
                 var e = (PointerEventArgs)ev;
                 if (s_lastPress.TryGetTarget(out var target))
                 {
-                    if (e.Pointer == s_lastPointer && ev.Source is Interactive i)
+                    if (e.Pointer == s_lastHeldPointer && ev.Source is Interactive i)
                     {
                         var point = e.GetCurrentPoint((Visual)target);
                         var settings = ((IInputRoot?)i.GetVisualRoot())?.PlatformSettings;
@@ -341,7 +341,8 @@ namespace Avalonia.Input
 
                         if (s_isHolding)
                         {
-                            i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Cancelled, s_lastPressPoint, s_lastPointer!.Type, e));
+                            i.RaiseEvent(new HoldingRoutedEventArgs(HoldingState.Cancelled, s_lastPressPoint, s_lastHeldPointer!.Type, e));
+                            s_lastHeldPointer = null;
                         }
                     }
                 }

From dac4ae422da17afb717c8e60e0728a1d8b1b4751 Mon Sep 17 00:00:00 2001
From: workgroupengineering <workgroupengineering@users.noreply.github.com>
Date: Mon, 8 Jan 2024 11:56:04 +0100
Subject: [PATCH 28/33] fix(XML Docs): Rename inheritdocs to inheritdoc
 (#14093)

---
 src/Avalonia.Base/Animation/Animators/BoolAnimator.cs      | 2 +-
 src/Avalonia.Base/Animation/Animators/ByteAnimator.cs      | 2 +-
 src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs   | 2 +-
 src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs    | 2 +-
 src/Avalonia.Base/Animation/Animators/FloatAnimator.cs     | 2 +-
 src/Avalonia.Base/Animation/Animators/Int16Animator.cs     | 2 +-
 src/Avalonia.Base/Animation/Animators/Int32Animator.cs     | 2 +-
 src/Avalonia.Base/Animation/Animators/Int64Animator.cs     | 2 +-
 src/Avalonia.Base/Animation/Animators/TransformAnimator.cs | 2 +-
 src/Avalonia.Base/Animation/Animators/UInt16Animator.cs    | 2 +-
 src/Avalonia.Base/Animation/Animators/UInt32Animator.cs    | 2 +-
 src/Avalonia.Base/Animation/Animators/UInt64Animator.cs    | 2 +-
 src/Avalonia.Base/Animation/TransitionBase.cs              | 4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
index 7c79a53cc5..25cdeca3e3 100644
--- a/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs
@@ -5,7 +5,7 @@
     /// </summary>
     internal class BoolAnimator : Animator<bool>
     {
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override bool Interpolate(double progress, bool oldValue, bool newValue)
         {
             if(progress >= 1d)
diff --git a/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs b/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
index 337ef9ecff..025193f3db 100644
--- a/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/ByteAnimator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)byte.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override byte Interpolate(double progress, byte oldValue, byte newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs b/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
index 8c737ca647..3decd79039 100644
--- a/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/DecimalAnimator.cs
@@ -5,7 +5,7 @@
     /// </summary>
     internal class DecimalAnimator : Animator<decimal>
     {
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override decimal Interpolate(double progress, decimal oldValue, decimal newValue)
         {
             return ((newValue - oldValue) * (decimal)progress) + oldValue;
diff --git a/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs b/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
index af44bcc9b4..f1ee72c166 100644
--- a/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/DoubleAnimator.cs
@@ -5,7 +5,7 @@
     /// </summary>
     internal class DoubleAnimator : Animator<double>
     {
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override double Interpolate(double progress, double oldValue, double newValue)
         {
             return ((newValue - oldValue) * progress) + oldValue;
diff --git a/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs b/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
index 608f421da5..bbff009d0a 100644
--- a/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/FloatAnimator.cs
@@ -5,7 +5,7 @@
     /// </summary>
     internal class FloatAnimator : Animator<float>
     {
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override float Interpolate(double progress, float oldValue, float newValue)
         {
             return (float)(((newValue - oldValue) * progress) + oldValue);
diff --git a/src/Avalonia.Base/Animation/Animators/Int16Animator.cs b/src/Avalonia.Base/Animation/Animators/Int16Animator.cs
index 4bd9aa3e84..610ef6ffda 100644
--- a/src/Avalonia.Base/Animation/Animators/Int16Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/Int16Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)Int16.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override Int16 Interpolate(double progress, Int16 oldValue, Int16 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/Int32Animator.cs b/src/Avalonia.Base/Animation/Animators/Int32Animator.cs
index 96c682b18e..adc9747f41 100644
--- a/src/Avalonia.Base/Animation/Animators/Int32Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/Int32Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)Int32.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override Int32 Interpolate(double progress, Int32 oldValue, Int32 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/Int64Animator.cs b/src/Avalonia.Base/Animation/Animators/Int64Animator.cs
index 1db357d64d..de654f15c1 100644
--- a/src/Avalonia.Base/Animation/Animators/Int64Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/Int64Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)Int64.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override Int64 Interpolate(double progress, Int64 oldValue, Int64 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
index c6155837ec..b1fc720e6a 100644
--- a/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/TransformAnimator.cs
@@ -92,7 +92,7 @@ namespace Avalonia.Animation.Animators
             return null;
         }
 
-        /// <inheritdocs/> 
+        /// <inheritdoc/> 
         public override double Interpolate(double p, double o, double n) => 0;
     }
 }
diff --git a/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
index d0d208827f..9d9cb39411 100644
--- a/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/UInt16Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)UInt16.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override UInt16 Interpolate(double progress, UInt16 oldValue, UInt16 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
index 35fff24cb6..94e24d20cd 100644
--- a/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/UInt32Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)UInt32.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override UInt32 Interpolate(double progress, UInt32 oldValue, UInt32 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs b/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
index cb3211c822..7de2552668 100644
--- a/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
+++ b/src/Avalonia.Base/Animation/Animators/UInt64Animator.cs
@@ -9,7 +9,7 @@ namespace Avalonia.Animation.Animators
     {
         const double maxVal = (double)UInt64.MaxValue;
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         public override UInt64 Interpolate(double progress, UInt64 oldValue, UInt64 newValue)
         {
             var normOV = oldValue / maxVal;
diff --git a/src/Avalonia.Base/Animation/TransitionBase.cs b/src/Avalonia.Base/Animation/TransitionBase.cs
index 8cc06ce7ed..e5ae073779 100644
--- a/src/Avalonia.Base/Animation/TransitionBase.cs
+++ b/src/Avalonia.Base/Animation/TransitionBase.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Animation
             set { SetAndRaise(EasingProperty, ref _easing, value); }
         }
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         [DisallowNull]
         public AvaloniaProperty? Property
         {
@@ -91,7 +91,7 @@ namespace Avalonia.Animation
             set => Property = value;
         }
 
-        /// <inheritdocs/>
+        /// <inheritdoc/>
         IDisposable ITransition.Apply(Animatable control, IClock clock, object? oldValue, object? newValue)
             => Apply(control, clock, oldValue, newValue);
         

From ac0f903052be13a7398df50d65904b40403ec75b Mon Sep 17 00:00:00 2001
From: exGensImpl <k-murzich@mail.ru>
Date: Tue, 9 Jan 2024 19:09:06 +0300
Subject: [PATCH 29/33] Improving TextBox behaviour on Ctrl+Backspace down
 event (#14138)

* Test: TextBox Ctrl+Back caret position

* Fixed: TextBox Ctrl+Back caret position

* Test: TextBox Ctrl+Back remove double whitespace

* Fixed: TextBox Ctrl+Back remove double whitespace

* Test: TextBox Ctrl+Back undo return caret position

* Fixed: TextBox Ctrl+Back undo return caret position
---
 src/Avalonia.Controls/TextBox.cs              | 28 ++++---
 .../TextBoxTests.cs                           | 73 +++++++++++++++++++
 2 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 8bd0286a0a..431be00f4e 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1307,13 +1307,13 @@ namespace Avalonia.Controls
                 {
                     case Key.Left:
                         selection = DetectSelection();
-                        MoveHorizontal(-1, hasWholeWordModifiers, selection);
+                        MoveHorizontal(-1, hasWholeWordModifiers, selection, true);
                         movement = true;
                         break;
 
                     case Key.Right:
                         selection = DetectSelection();
-                        MoveHorizontal(1, hasWholeWordModifiers, selection);
+                        MoveHorizontal(1, hasWholeWordModifiers, selection, true);
                         movement = true;
                         break;
 
@@ -1781,7 +1781,7 @@ namespace Avalonia.Controls
         /// </summary>
         public void Clear() => SetCurrentValue(TextProperty, string.Empty);
 
-        private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting)
+        private void MoveHorizontal(int direction, bool wholeWord, bool isSelecting, bool moveCaretPosition)
         {
             if (_presenter == null)
             {
@@ -1836,10 +1836,13 @@ namespace Avalonia.Controls
                 }
 
                 SetCurrentValue(SelectionEndProperty, SelectionEnd + offset);
+                
+                if (moveCaretPosition)
+                {
+                    _presenter.MoveCaretToTextPosition(SelectionEnd);
+                }
 
-                _presenter.MoveCaretToTextPosition(SelectionEnd);
-
-                if (!isSelecting)
+                if (!isSelecting && moveCaretPosition)
                 {
                     SetCurrentValue(CaretIndexProperty, SelectionEnd);
                 }
@@ -1976,7 +1979,7 @@ namespace Avalonia.Controls
 
                 _presenter?.MoveCaretToTextPosition(start);
 
-                SetCurrentValue(CaretIndexProperty, start);
+                SetCurrentValue(SelectionStartProperty, start);
 
                 ClearSelection();
 
@@ -2066,9 +2069,16 @@ namespace Avalonia.Controls
 
         private void SetSelectionForControlBackspace()
         {
+            var text = Text ?? string.Empty;
             var selectionStart = CaretIndex;
 
-            MoveHorizontal(-1, true, false);
+            MoveHorizontal(-1, true, false, false);
+            
+            if (SelectionEnd > 0 && 
+                selectionStart < text.Length && text[selectionStart] == ' ')
+            {
+                SetCurrentValue(SelectionEndProperty, SelectionEnd - 1);
+            }
 
             SetCurrentValue(SelectionStartProperty, selectionStart);
         }
@@ -2083,7 +2093,7 @@ namespace Avalonia.Controls
 
             SetCurrentValue(SelectionStartProperty, CaretIndex);
 
-            MoveHorizontal(1, true, true);
+            MoveHorizontal(1, true, true, false);
 
             if (SelectionEnd < textLength && Text![SelectionEnd] == ' ')
             {
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 1ee154c44a..a53d1dd5a1 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -151,6 +151,79 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(4, target.CaretIndex);
             }
         }
+        
+        [Fact]
+        public void Control_Backspace_Should_Set_Caret_Position_To_The_Start_Of_The_Deletion()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "First Second Third",
+                    SelectionStart = 13,
+                    SelectionEnd = 13
+                };
+
+                target.CaretIndex = 10;
+                target.ApplyTemplate();
+
+                // (First Second |Third)
+                RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
+                // (First |Third)
+                
+                Assert.Equal(6, target.CaretIndex);
+            }
+        }
+        
+        [Fact]
+        public void Control_Backspace_Should_Remove_The_Double_Whitespace_If_Caret_Index_Was_At_The_End_Of_A_Word()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "First Second Third",
+                    SelectionStart = 12,
+                    SelectionEnd = 12
+                };
+
+                target.ApplyTemplate();
+                
+                // (First Second| Third)
+                RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
+                // (First| Third)
+
+                Assert.Equal("First Third", target.Text);
+            }
+        }
+
+        [Fact]
+        public void Control_Backspace_Undo_Should_Return_Caret_Position()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "First Second Third",
+                    SelectionStart = 9,
+                    SelectionEnd = 9
+                };
+
+                target.ApplyTemplate();
+                
+                // (First Second| Third)
+                RaiseKeyEvent(target, Key.Back, KeyModifiers.Control);
+                // (First| Third)
+                
+                target.Undo();
+                // (First Second| Third)
+
+                Assert.Equal(9, target.CaretIndex);
+            }
+        }
 
         [Fact]
         public void Press_Ctrl_A_Select_All_Text()

From 3ac61937e297aa75f715980bf471b43446c1a9f6 Mon Sep 17 00:00:00 2001
From: Omid Mafakher <omid.mafakher@edenred.com>
Date: Wed, 10 Jan 2024 09:05:34 +0100
Subject: [PATCH 30/33] Add key device type and implmentation for tizen
 (#14027)

* Add key device type and implmentation for tizen #12992

* Add device key type to Android

* Resolve comments

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 .../Helpers/AndroidKeyboardEventsHelper.cs    |  16 +
 src/Avalonia.Base/Input/Key.cs                |  69 ++++
 src/Avalonia.Base/Input/KeyDeviceType.cs      |  15 +
 src/Avalonia.Base/Input/KeyEventArgs.cs       |   5 +
 src/Avalonia.Base/Input/KeyboardDevice.cs     |   1 +
 .../Input/Raw/RawKeyEventArgs.cs              |  17 +-
 src/Avalonia.Controls/TopLevel.cs             |   1 +
 .../Avalonia.Tizen/NuiKeyboardHandler.cs      |  46 ++-
 .../Platform/Input/TizenKeyboardDevice.cs     | 332 +++++++-----------
 9 files changed, 277 insertions(+), 225 deletions(-)
 create mode 100644 src/Avalonia.Base/Input/KeyDeviceType.cs

diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 3dda301b6b..eed8069a93 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -53,6 +53,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
 
             var physicalKey = AndroidKeyInterop.PhysicalKeyFromScanCode(e.ScanCode);
             var keySymbol = GetKeySymbol(e.UnicodeChar, physicalKey);
+            var keyDeviceType = GetKeyDeviceType(e);
 
             var rawKeyEvent = new RawKeyEventArgs(
                           AndroidKeyboardDevice.Instance!,
@@ -62,6 +63,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
                           AndroidKeyboardDevice.ConvertKey(e.KeyCode),
                           GetModifierKeys(e),
                           physicalKey,
+                          keyDeviceType,
                           keySymbol);
 
             _view.Input?.Invoke(rawKeyEvent);
@@ -124,6 +126,20 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             }
         }
 
+        private KeyDeviceType GetKeyDeviceType(KeyEvent e)
+        {
+            var source = e.Device?.Sources ?? InputSourceType.Unknown;
+            if (source is InputSourceType.Joystick or
+                InputSourceType.ClassJoystick or
+                InputSourceType.Gamepad)
+                return KeyDeviceType.Gamepad;
+
+            if (source == InputSourceType.Dpad && e.Device?.KeyboardType == InputKeyboardType.NonAlphabetic)
+                return KeyDeviceType.Remote;
+
+            return KeyDeviceType.Keyboard;
+        }
+
         public void Dispose()
         {
             HandleEvents = false;
diff --git a/src/Avalonia.Base/Input/Key.cs b/src/Avalonia.Base/Input/Key.cs
index 33e1e5df45..71f93e974f 100644
--- a/src/Avalonia.Base/Input/Key.cs
+++ b/src/Avalonia.Base/Input/Key.cs
@@ -1036,5 +1036,74 @@ namespace Avalonia.Input
         /// OSX Platform-specific Fn+Down key
         /// </summary>
         FnDownArrow = 10004,
+
+        /// <summary>
+        /// Remove control home button
+        /// </summary>
+        MediaHome = 100000,
+        /// <summary>
+        /// TV Channel up
+        /// </summary>
+        MediaChannelList = 100001,
+        /// <summary>
+        /// TV Channel up
+        /// </summary>
+        MediaChannelRaise = 100002,
+        /// <summary>
+        /// TV Channel down
+        /// </summary>
+        MediaChannelLower = 100003,
+        /// <summary>
+        /// TV Channel down
+        /// </summary>
+        MediaRecord = 100005,
+        /// <summary>
+        /// Remote control Red button
+        /// </summary>
+        MediaRed = 100010,
+        /// <summary>
+        /// Remote control Green button
+        /// </summary>
+        MediaGreen = 100011,
+        /// <summary>
+        /// Remote control Yellow button
+        /// </summary>
+        MediaYellow = 100012,
+        /// <summary>
+        /// Remote control Blue button
+        /// </summary>
+        MediaBlue = 100013,
+        /// <summary>
+        /// Remote control Menu button
+        /// </summary>
+        MediaMenu = 100020,
+        /// <summary>
+        /// Remote control dots button
+        /// </summary>
+        MediaMore = 100021,
+        /// <summary>
+        /// Remote control option button
+        /// </summary>
+        MediaOption = 100022,
+        /// <summary>
+        /// Remote control channel info button
+        /// </summary>
+        MediaInfo = 100023,
+        /// <summary>
+        /// Remote control search button
+        /// </summary>
+        MediaSearch = 100024,
+        /// <summary>
+        /// Remote control subtitle/caption button
+        /// </summary>
+        MediaSubtitle = 100025,
+        /// <summary>
+        /// Remote control Tv guide detail button
+        /// </summary>
+        MediaTvGuide = 100026,
+        /// <summary>
+        /// Remote control Previous Channel
+        /// </summary>
+        MediaPreviousChannel = 100027,
     }
 }
diff --git a/src/Avalonia.Base/Input/KeyDeviceType.cs b/src/Avalonia.Base/Input/KeyDeviceType.cs
new file mode 100644
index 0000000000..4e16e787f3
--- /dev/null
+++ b/src/Avalonia.Base/Input/KeyDeviceType.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Input
+{
+    public enum KeyDeviceType
+    {
+        Keyboard,
+        Gamepad,
+        Remote
+    }
+}
diff --git a/src/Avalonia.Base/Input/KeyEventArgs.cs b/src/Avalonia.Base/Input/KeyEventArgs.cs
index 3de078fb37..864aa02617 100644
--- a/src/Avalonia.Base/Input/KeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/KeyEventArgs.cs
@@ -71,4 +71,9 @@ public class KeyEventArgs : RoutedEventArgs
     /// <see cref="Key"/>
     /// <see cref="PhysicalKey"/>
     public string? KeySymbol { get; init; }
+
+    /// <summary>
+    /// Type of the device that fire the event
+    /// </summary>
+    public KeyDeviceType KeyDeviceType { get; init; }
 }
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
index 0cee1bbc96..a6d2ab7a86 100644
--- a/src/Avalonia.Base/Input/KeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -196,6 +196,7 @@ namespace Avalonia.Input
                             KeyModifiers = keyInput.Modifiers.ToKeyModifiers(),
                             PhysicalKey = keyInput.PhysicalKey,
                             KeySymbol = keyInput.KeySymbol,
+                            KeyDeviceType = keyInput.KeyDeviceType,
                             Source = element
                         };
                         
diff --git a/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs b/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
index 339481ef63..3995e7765c 100644
--- a/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
+++ b/src/Avalonia.Base/Input/Raw/RawKeyEventArgs.cs
@@ -20,7 +20,7 @@ namespace Avalonia.Input.Raw
             RawKeyEventType type,
             Key key,
             RawInputModifiers modifiers)
-            : this(device, timestamp, root, type, key, modifiers, PhysicalKey.None, null)
+            : this(device, timestamp, root, type, key, modifiers, PhysicalKey.None, KeyDeviceType.Keyboard, null)
         {
             Key = key;
             Type = type;
@@ -36,6 +36,18 @@ namespace Avalonia.Input.Raw
             RawInputModifiers modifiers,
             PhysicalKey physicalKey,
             string? keySymbol)
+            : this(device, timestamp, root, type, key, modifiers, physicalKey, KeyDeviceType.Keyboard, keySymbol) { }
+
+        public RawKeyEventArgs(
+            IInputDevice device,
+            ulong timestamp,
+            IInputRoot root,
+            RawKeyEventType type,
+            Key key,
+            RawInputModifiers modifiers,
+            PhysicalKey physicalKey,
+            KeyDeviceType keyDeviceType,
+            string? keySymbol)
             : base(device, timestamp, root)
         {
             Key = key;
@@ -43,6 +55,7 @@ namespace Avalonia.Input.Raw
             Type = type;
             PhysicalKey = physicalKey;
             KeySymbol = keySymbol;
+            KeyDeviceType = keyDeviceType;
         }
 
         public Key Key { get; set; }
@@ -53,6 +66,8 @@ namespace Avalonia.Input.Raw
 
         public PhysicalKey PhysicalKey { get; set; }
 
+        public KeyDeviceType KeyDeviceType { get; set; }
+
         public string? KeySymbol { get; set; }
     }
 }
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 5026896d41..46752446bb 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -291,6 +291,7 @@ namespace Avalonia.Controls
                             KeyModifiers = (KeyModifiers)rawKeyEventArgs.Modifiers,
                             Key = rawKeyEventArgs.Key,
                             PhysicalKey = rawKeyEventArgs.PhysicalKey,
+                            KeyDeviceType= rawKeyEventArgs.KeyDeviceType,
                             KeySymbol = rawKeyEventArgs.KeySymbol
                         };
 
diff --git a/src/Tizen/Avalonia.Tizen/NuiKeyboardHandler.cs b/src/Tizen/Avalonia.Tizen/NuiKeyboardHandler.cs
index f0fbbbf563..52e062f6d8 100644
--- a/src/Tizen/Avalonia.Tizen/NuiKeyboardHandler.cs
+++ b/src/Tizen/Avalonia.Tizen/NuiKeyboardHandler.cs
@@ -1,4 +1,5 @@
-using Avalonia.Input;
+using System.Diagnostics;
+using Avalonia.Input;
 using Avalonia.Input.Raw;
 using Avalonia.Logging;
 using Avalonia.Tizen.Platform.Input;
@@ -26,14 +27,10 @@ internal class NuiKeyboardHandler
 
         if (ShouldSendKeyEvent(e, out var keyCode))
         {
-            var mapped = TizenKeyboardDevice.ConvertKey(keyCode);
-            if (mapped == Input.Key.None)
-                return;
-
             Logger.TryGet(LogEventLevel.Debug, LogKey)?.Log(null, "Triggering key event {text}", e.Key.KeyString);
-            SendKeyEvent(e, mapped);
+            SendKeyEvent(e, keyCode);
         }
-        else if (e.Key.State == Key.StateType.Up)
+        else if (e.Key.State == Key.StateType.Up && !string.IsNullOrEmpty(e.Key.KeyString))
         {
             Logger.TryGet(LogEventLevel.Debug, LogKey)?.Log(null, "Triggering text input {text}", e.Key.KeyString);
             _view.TopLevelImpl.TextInput(e.Key.KeyString);
@@ -44,6 +41,7 @@ internal class NuiKeyboardHandler
     {
         var type = GetKeyEventType(e);
         var modifiers = GetModifierKey(e);
+        var deviceType = GetDeviceType(e);
 
         _view.TopLevelImpl.Input?.Invoke(
             new RawKeyEventArgs(
@@ -52,22 +50,25 @@ internal class NuiKeyboardHandler
                 _view.InputRoot,
                 type,
                 mapped,
-                modifiers));
+                modifiers,
+                PhysicalKey.None,
+                deviceType,
+                e.Key.KeyString
+                ));
     }
 
-    private bool ShouldSendKeyEvent(Window.KeyEventArgs e, out global::Tizen.Uix.InputMethod.KeyCode keyCode)
+    private bool ShouldSendKeyEvent(Window.KeyEventArgs e, out Input.Key keyCode)
     {
-        if (string.IsNullOrEmpty(e.Key.KeyString) || 
-            e.Key.KeyPressedName is "Delete" or "BackSpace" ||
-            e.Key.IsCtrlModifier() || 
-            e.Key.IsAltModifier())
+        keyCode = TizenKeyboardDevice.GetSpecialKey(e.Key.KeyPressedName);
+        if (keyCode != Input.Key.None)
+            return true;
+
+        if ((e.Key.IsCtrlModifier() || e.Key.IsAltModifier()) && !string.IsNullOrEmpty(e.Key.KeyString))
         {
-            if (Enum.TryParse(e.Key.KeyPressedName, true, out keyCode) ||
-                Enum.TryParse($"Keypad{e.Key.KeyPressedName}", true, out keyCode))
-                return true;
+            var c = e.Key.KeyPressedName.Length == 1 ? e.Key.KeyPressedName[0] : (char)e.Key.KeyCode;
+            return (keyCode = TizenKeyboardDevice.GetAsciiKey(c)) != Input.Key.None;
         }
 
-        keyCode = 0;
         return false;
     }
 
@@ -99,4 +100,15 @@ internal class NuiKeyboardHandler
 
         return modifiers;
     }
+
+    private KeyDeviceType GetDeviceType(Window.KeyEventArgs ev)
+    {
+        if (ev.Key.DeviceClass == DeviceClassType.Gamepad)
+            return KeyDeviceType.Gamepad;
+
+        if (ev.Key.DeviceSubClass == DeviceSubClassType.Remocon)
+            return KeyDeviceType.Remote;
+
+        return KeyDeviceType.Keyboard;
+    }
 }
diff --git a/src/Tizen/Avalonia.Tizen/Platform/Input/TizenKeyboardDevice.cs b/src/Tizen/Avalonia.Tizen/Platform/Input/TizenKeyboardDevice.cs
index 6d595014a1..1046134c43 100644
--- a/src/Tizen/Avalonia.Tizen/Platform/Input/TizenKeyboardDevice.cs
+++ b/src/Tizen/Avalonia.Tizen/Platform/Input/TizenKeyboardDevice.cs
@@ -4,218 +4,136 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Input;
+using Tizen.NUI.Components;
 using Tizen.Uix.InputMethod;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Avalonia.Tizen.Platform.Input;
-internal class TizenKeyboardDevice: KeyboardDevice, IKeyboardDevice
+internal class TizenKeyboardDevice : KeyboardDevice, IKeyboardDevice
 {
-    private static readonly Dictionary<KeyCode, Key> KeyDic = new Dictionary<KeyCode, Key>
-     {
-         //   { KeyCode.Cancel?, Key.Cancel },
-            { KeyCode.BackSpace, Key.Back },
-            { KeyCode.Tab, Key.Tab },
-          //  { KeyCode.Linefeed?, Key.LineFeed },
-            { KeyCode.Clear, Key.Clear },
-            { KeyCode.Return, Key.Return },
-            { KeyCode.Pause, Key.Pause },
-            { KeyCode.CapsLock, Key.CapsLock },
-            //{ KeyCode.?, Key.HangulMode }
-            //{ KeyCode.?, Key.JunjaMode }
-            //{ KeyCode.?, Key.FinalMode }
-            //{ KeyCode.?, Key.KanjiMode }
-            { KeyCode.Escape, Key.Escape },
-            //{ KeyCode.?, Key.ImeConvert }
-            //{ KeyCode.?, Key.ImeNonConvert }
-            //{ KeyCode.?, Key.ImeAccept }
-            //{ KeyCode.?, Key.ImeModeChange }
-            { KeyCode.Space, Key.Space },
-            { KeyCode.Page_Up, Key.Prior },
-            { KeyCode.Page_Down, Key.PageDown },
-            { KeyCode.End, Key.End },
-            { KeyCode.Home, Key.Home },
-            { KeyCode.Left, Key.Left },
-            { KeyCode.Up, Key.Up },
-            { KeyCode.Right, Key.Right },
-            { KeyCode.Down, Key.Down },
-           // { KeyCode.ButtonSelect?, Key.Select },
-           // { KeyCode.print?, Key.Print },
-            //{ KeyCode.execute?, Key.Execute },
-            //{ KeyCode.snap?, Key.Snapshot }
-            { KeyCode.Insert, Key.Insert },
-            { KeyCode.Delete, Key.Delete },
-            { KeyCode.Help, Key.Help },
-            { KeyCode.Keypad0, Key.D0 },
-            { KeyCode.Keypad1, Key.D1 },
-            { KeyCode.Keypad2, Key.D2 },
-            { KeyCode.Keypad3, Key.D3 },
-            { KeyCode.Keypad4, Key.D4 },
-            { KeyCode.Keypad5, Key.D5 },
-            { KeyCode.Keypad6, Key.D6 },
-            { KeyCode.Keypad7, Key.D7 },
-            { KeyCode.Keypad8, Key.D8 },
-            { KeyCode.Keypad9, Key.D9 },
-            { KeyCode.KeypadA, Key.A },
-            { KeyCode.KeypadB, Key.B },
-            { KeyCode.KeypadC, Key.C },
-            { KeyCode.KeypadD, Key.D },
-            { KeyCode.KeypadE, Key.E },
-            { KeyCode.KeypadF, Key.F },
-            { KeyCode.KeypadG, Key.G },
-            { KeyCode.KeypadH, Key.H },
-            { KeyCode.KeypadI, Key.I },
-            { KeyCode.KeypadJ, Key.J },
-            { KeyCode.KeypadK, Key.K },
-            { KeyCode.KeypadL, Key.L },
-            { KeyCode.KeypadM, Key.M },
-            { KeyCode.KeypadN, Key.N },
-            { KeyCode.KeypadO, Key.O },
-            { KeyCode.KeypadP, Key.P },
-            { KeyCode.KeypadQ, Key.Q },
-            { KeyCode.KeypadR, Key.R },
-            { KeyCode.KeypadS, Key.S },
-            { KeyCode.KeypadT, Key.T },
-            { KeyCode.KeypadU, Key.U },
-            { KeyCode.KeypadV, Key.V },
-            { KeyCode.KeypadW, Key.W },
-            { KeyCode.KeypadX, Key.X },
-            { KeyCode.KeypadY, Key.Y },
-            { KeyCode.KeypadZ, Key.Z },
-            { KeyCode.Keypada, Key.A },
-            { KeyCode.Keypadb, Key.B },
-            { KeyCode.Keypadc, Key.C },
-            { KeyCode.Keypadd, Key.D },
-            { KeyCode.Keypade, Key.E },
-            { KeyCode.Keypadf, Key.F },
-            { KeyCode.Keypadg, Key.G },
-            { KeyCode.Keypadh, Key.H },
-            { KeyCode.Keypadi, Key.I },
-            { KeyCode.Keypadj, Key.J },
-            { KeyCode.Keypadk, Key.K },
-            { KeyCode.Keypadl, Key.L },
-            { KeyCode.Keypadm, Key.M },
-            { KeyCode.Keypadn, Key.N },
-            { KeyCode.Keypado, Key.O },
-            { KeyCode.Keypadp, Key.P },
-            { KeyCode.Keypadq, Key.Q },
-            { KeyCode.Keypadr, Key.R },
-            { KeyCode.Keypads, Key.S },
-            { KeyCode.Keypadt, Key.T },
-            { KeyCode.Keypadu, Key.U },
-            { KeyCode.Keypadv, Key.V },
-            { KeyCode.Keypadw, Key.W },
-            { KeyCode.Keypadx, Key.X },
-            { KeyCode.Keypady, Key.Y },
-            { KeyCode.Keypadz, Key.Z },
-            //{ KeyCode.?, Key.LWin }
-            //{ KeyCode.?, Key.RWin }
-            //{ KeyCode.?, Key.Apps }
-            //{ KeyCode.Sle, Key.Sleep },
-            { KeyCode.KP0, Key.NumPad0 },
-            { KeyCode.KP1, Key.NumPad1 },
-            { KeyCode.KP2, Key.NumPad2 },
-            { KeyCode.KP3, Key.NumPad3 },
-            { KeyCode.KP4, Key.NumPad4 },
-            { KeyCode.KP5, Key.NumPad5 },
-            { KeyCode.KP6, Key.NumPad6 },
-            { KeyCode.KP7, Key.NumPad7 },
-            { KeyCode.KP8, Key.NumPad8 },
-            { KeyCode.KP9, Key.NumPad9 },
-            { KeyCode.KPMultiply, Key.Multiply },
-            { KeyCode.KPAdd, Key.Add },
-            { KeyCode.KPSeparator, Key.Separator },
-            { KeyCode.KPSubtract, Key.Subtract },
-            { KeyCode.KPDecimal, Key.Decimal },
-            { KeyCode.KPDivide, Key.Divide },
-            { KeyCode.F1, Key.F1 },
-            { KeyCode.F2, Key.F2 },
-            { KeyCode.F3, Key.F3 },
-            { KeyCode.F4, Key.F4 },
-            { KeyCode.F5, Key.F5 },
-            { KeyCode.F6, Key.F6 },
-            { KeyCode.F7, Key.F7 },
-            { KeyCode.F8, Key.F8 },
-            { KeyCode.F9, Key.F9 },
-            { KeyCode.F10, Key.F10 },
-            { KeyCode.F11, Key.F11 },
-            { KeyCode.F12, Key.F12 },
-            //{ KeyCode.f13, Key.F13 },
-            //{ KeyCode.F14, Key.F14 },
-            //{ KeyCode.L5, Key.F15 },
-            //{ KeyCode.F16, Key.F16 },
-            //{ KeyCode.F17, Key.F17 },
-            //{ KeyCode.L8, Key.F18 },
-            //{ KeyCode.L9, Key.F19 },
-            //{ KeyCode.L10, Key.F20 },
-            //{ KeyCode.R1, Key.F21 },
-            //{ KeyCode.R2, Key.F22 },
-            //{ KeyCode.F23, Key.F23 },
-            //{ KeyCode.R4, Key.F24 },
-            { KeyCode.Num_Lock, Key.NumLock },
-            { KeyCode.ScrollLock, Key.Scroll },
-            { KeyCode.ShiftL, Key.LeftShift },
-            { KeyCode.ShiftR, Key.RightShift },
-            { KeyCode.ControlL, Key.LeftCtrl },
-            { KeyCode.ControlR, Key.RightCtrl },
-            { KeyCode.AltL, Key.LeftAlt },
-            { KeyCode.AltR, Key.RightAlt },
-            //{ KeyCode.?, Key.BrowserBack }
-            //{ KeyCode.?, Key.BrowserForward }
-            //{ KeyCode.?, Key.BrowserRefresh }
-            //{ KeyCode.?, Key.BrowserStop }
-            //{ KeyCode.?, Key.BrowserSearch }
-            //{ KeyCode.?, Key.BrowserFavorites }
-            //{ KeyCode.?, Key.BrowserHome }
-            //{ KeyCode.?, Key.VolumeMute }
-            //{ KeyCode.VolumeDown, Key.VolumeDown },
-            //{ KeyCode.VolumeUp, Key.VolumeUp },
-            //{ KeyCode.MediaNext, Key.MediaNextTrack },
-            //{ KeyCode.MediaPrevious, Key.MediaPreviousTrack },
-            //{ KeyCode.MediaStop, Key.MediaStop },
-            //{ KeyCode.MediaPlayPause, Key.MediaPlayPause },
-            //{ KeyCode.?, Key.LaunchMail }
-            //{ KeyCode.?, Key.SelectMedia }
-            //{ KeyCode.?, Key.LaunchApplication1 }
-            //{ KeyCode.?, Key.LaunchApplication2 }
-            { KeyCode.Semicolon, Key.OemSemicolon },
-            { KeyCode.Plus, Key.OemPlus },
-            { KeyCode.Comma, Key.OemComma },
-            { KeyCode.Minus, Key.OemMinus },
-            { KeyCode.Period, Key.OemPeriod },
-            //{ KeyCode.?, Key.Oem2 }
-            { KeyCode.Grave, Key.OemTilde },
-            //{ KeyCode.?, Key.AbntC1 }
-            //{ KeyCode.?, Key.AbntC2 }
-            //{ KeyCode.?, Key.OemPipe }
-            { KeyCode.Apostrophe, Key.OemQuotes },
-            { KeyCode.Slash, Key.OemQuestion },
-            { KeyCode.BraceLeft, Key.OemOpenBrackets },
-            { KeyCode.BracketRight, Key.OemCloseBrackets },
-            //{ KeyCode.?, Key.Oem7 }
-            //{ KeyCode.?, Key.Oem8 }
-            //{ KeyCode.?, Key.Oem102 }
-            //{ KeyCode.?, Key.ImeProcessed }
-            //{ KeyCode.?, Key.System }
-            //{ KeyCode.?, Key.OemAttn }
-            //{ KeyCode.?, Key.OemFinish }
-            //{ KeyCode.?, Key.DbeHiragana }
-            //{ KeyCode.?, Key.OemAuto }
-            //{ KeyCode.?, Key.DbeDbcsChar }
-            //{ KeyCode.?, Key.OemBackTab }
-            //{ KeyCode.?, Key.Attn }
-            //{ KeyCode.?, Key.DbeEnterWordRegisterMode }
-            //{ KeyCode.?, Key.DbeEnterImeConfigureMode }
-            //{ KeyCode.?, Key.EraseEof }
-            //{ KeyCode.MediaPlay, Key.Play },
-            //{ KeyCode.?, Key.Zoom }
-            //{ KeyCode.?, Key.NoName }
-            //{ KeyCode.?, Key.DbeEnterDialogConversionMode }
-            //{ KeyCode.?, Key.OemClear }
-            //{ KeyCode.?, Key.DeadCharProcessed }
-            { KeyCode.Backslash, Key.OemBackslash }
-        };
+    private static readonly Dictionary<string, Key> SpecialKeys = new Dictionary<string, Key>
+    {
+        // Media keys
+        { "XF86Red", Key.MediaRed },
+        { "XF86Green", Key.MediaGreen },
+        { "XF86Yellow", Key.MediaYellow },
+        { "XF86Blue", Key.MediaBlue },
+        { "XF86Info", Key.MediaInfo },
+        { "XF86SimpleMenu", Key.MediaMenu },
+        { "XF86Caption", Key.MediaSubtitle },
+        { "XF86MTS", Key.None },
+        { "XF86PictureSize", Key.None },
+        { "XF86More", Key.MediaMore },
+        { "XF86Search", Key.MediaSearch },
+        { "XF863D", Key.None },
+        { "XF86AudioRewind", Key.MediaPreviousTrack },
+        { "XF86AudioPause", Key.MediaPlayPause },
+        { "XF86AudioNext", Key.MediaNextTrack },
+        { "XF86AudioRecord", Key.MediaRecord },
+        { "XF86AudioPlay", Key.MediaPlayPause },
+        { "XF86AudioStop", Key.MediaStop },
+        { "XF86ChannelGuide", Key.MediaTvGuide },
+        { "XF86SysMenu", Key.Apps },
+        { "minus", Key.OemMinus },
+        { "XF86PreviousChannel", Key.MediaPreviousChannel },
+        { "XF86AudioMute", Key.VolumeMute },
+        { "XF86ChannelList", Key.MediaChannelList },
+        { "XF86RaiseChannel", Key.MediaChannelRaise },
+        { "XF86LowerChannel", Key.MediaChannelLower },
+        { "XF86AudioRaiseVolume", Key.VolumeUp },
+        { "XF86AudioLowerVolume", Key.VolumeDown },
+        { "XF86Display", Key.None },
+        { "XF86PowerOff", Key.Sleep },
+        { "XF86PlayBack", Key.MediaPlayPause },
+        { "XF86Home", Key.MediaHome },
+        { "XF86Back", Key.Back },
+        { "XF86Exit", Key.Cancel },
+
+        { "Shift_L", Key.LeftShift },
+        { "Control_L", Key.LeftCtrl },
+        { "Alt_L", Key.LeftAlt },
+        { "Super_L", Key.LWin },
+        { "Alt_R", Key.RightAlt },
+        { "Control_R", Key.RightCtrl },
+        { "Shift_R", Key.RightShift },
+        { "Super_R", Key.RWin },
+        { "Menu", Key.Apps },
+        { "Tab", Key.Tab },
+        { "BackSpace", Key.Back },
+        { "Return", Key.Return },
+        { "Delete", Key.Delete },
+        { "End", Key.End },
+        { "Next", Key.Next },
+        { "Prior", Key.Prior },
+        { "Home", Key.Home },
+        { "Insert", Key.Insert },
+        { "Num_Lock", Key.NumLock },
+        { "Left", Key.Left },
+        { "Up", Key.Up },
+        { "Right", Key.Right },
+        { "Down", Key.Down },
+        { "Escape", Key.Escape },
+        { "Caps_Lock", Key.CapsLock },
+        { "Pause", Key.Pause },
+        { "Scroll_Lock", Key.Scroll },
+        { "Scroll", Key.Scroll },
+
+    };
 
-    internal static Key ConvertKey(KeyCode key)
+    internal static Key GetSpecialKey(string key)
     {
-        return KeyDic.TryGetValue(key, out var result) ? result : Key.None;
+        return SpecialKeys.TryGetValue(key, out var result) ? result : Key.None;
     }
+
+    internal static Key GetAsciiKey(char keyCode) => keyCode switch
+    {
+        '`' or '~' => Key.Oem7,
+        '0' or ')' => Key.D0,
+        '1' or '!' => Key.D1,
+        '2' or '@' => Key.D2,
+        '3' or '#' => Key.D3,
+        '4' or '$' => Key.D4,
+        '5' or '%' => Key.D5,
+        '6' or '^' => Key.D6,
+        '7' or '&' => Key.D7,
+        '8' or '*' => Key.D8,
+        '9' or '(' => Key.D9,
+        '\'' or '"' => Key.OemQuotes,
+        '-' or '_' => Key.OemMinus,
+        '=' or '+' => Key.OemPlus,
+        '<' or ',' => Key.OemComma,
+        '>' or '.' => Key.OemPeriod,
+        ';' or ':' => Key.OemSemicolon,
+        '/' or '?' => Key.OemQuestion,
+        '[' or '{' => Key.OemOpenBrackets,
+        ']' or '}' => Key.OemCloseBrackets,
+        '\\' or '|' => Key.OemPipe,
+        'a' or 'A' => Key.A,
+        'b' or 'B' => Key.B,
+        'c' or 'C' => Key.C,
+        'd' or 'D' => Key.D,
+        'e' or 'E' => Key.E,
+        'f' or 'F' => Key.F,
+        'g' or 'G' => Key.G,
+        'h' or 'H' => Key.H,
+        'i' or 'I' => Key.I,
+        'j' or 'J' => Key.J,
+        'k' or 'K' => Key.K,
+        'l' or 'L' => Key.L,
+        'm' or 'M' => Key.M,
+        'n' or 'N' => Key.N,
+        'o' or 'O' => Key.O,
+        'p' or 'P' => Key.P,
+        'q' or 'Q' => Key.Q,
+        'r' or 'R' => Key.R,
+        's' or 'S' => Key.S,
+        't' or 'T' => Key.T,
+        'u' or 'U' => Key.U,
+        'v' or 'V' => Key.V,
+        'w' or 'W' => Key.W,
+        'x' or 'X' => Key.X,
+        'y' or 'Y' => Key.Y,
+        'z' or 'Z' => Key.Z,
+        _ => Key.None
+    };
 }

From 0e014f9cb627d99fb4e1afa389b4c073c836e9b6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 10 Jan 2024 08:06:07 +0000
Subject: [PATCH 31/33] Add an event so that users can detect when an
 Application icon is clicked (#14106)

* Add an event so that users can detect when an Application icon is clicked.

* refactor to use Lifetime apis.

* use ActivationKind instead of reason to be consistent with other xaml platforms

* implement macos raise url events.

* add docs.

* add apis to programatically Activate and Deactivate the application.

This allows the dock icon to be kept in sync so its menu options there say "Hide" / "Show" correctly.

* fix api naming.

* Add Browser IActivatableApplicationLifetime impl

* Implement IActivatableApplicationLifetime on Android

* Add IActivatableApplicationLifetime iOS implementation

* Adjust android impl a little

---------

Co-authored-by: Max Katz <maxkatz6@outlook.com>
---
 native/Avalonia.Native/src/OSX/app.mm         | 23 ++++++++
 native/Avalonia.Native/src/OSX/common.h       |  1 +
 .../ControlCatalog.Android/MainActivity.cs    |  7 ++-
 samples/ControlCatalog/App.xaml.cs            |  8 +++
 .../AvaloniaMainActivity.App.cs               |  2 +-
 .../Avalonia.Android/AvaloniaMainActivity.cs  | 40 ++++++++++++-
 .../IAndroidNavigationService.cs              |  1 +
 .../Avalonia.Android/IAvaloniaActivity.cs     | 10 ++++
 .../Avalonia.Android/SingleViewLifetime.cs    | 23 +++++++-
 .../ActivatedEventArgs.cs                     | 23 ++++++++
 .../ApplicationLifetimes/ActivationKind.cs    | 25 ++++++++
 .../ClassicDesktopStyleApplicationLifetime.cs | 13 +++--
 .../IActivatableApplicationLifetime.cs        | 35 +++++++++++
 .../ProtocolActivatedEventArgs.cs             | 13 +++++
 .../Platform/INativeApplicationCommands.cs    |  1 +
 .../AvaloniaNativeApplicationPlatform.cs      | 32 ++++++++++
 .../AvaloniaNativePlatformExtensions.cs       |  4 ++
 ...SClassicDesktopStyleApplicationLifetime.cs | 50 ++++++++++++++++
 .../MacOSNativeMenuCommands.cs                |  6 +-
 src/Avalonia.Native/avn.idl                   |  4 ++
 .../Avalonia.Browser/BrowserAppBuilder.cs     |  3 +-
 .../BrowserSingleViewLifetime.cs              | 31 +++++++++-
 .../Avalonia.Browser/Interop/InputHelper.cs   |  5 +-
 .../webapp/modules/avalonia/input.ts          |  8 +++
 src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs   | 58 +++++++++++++++----
 src/iOS/Avalonia.iOS/SingleViewLifetime.cs    | 27 +++++++++
 26 files changed, 428 insertions(+), 25 deletions(-)
 create mode 100644 src/Android/Avalonia.Android/IAvaloniaActivity.cs
 create mode 100644 src/Avalonia.Controls/ApplicationLifetimes/ActivatedEventArgs.cs
 create mode 100644 src/Avalonia.Controls/ApplicationLifetimes/ActivationKind.cs
 create mode 100644 src/Avalonia.Controls/ApplicationLifetimes/IActivatableApplicationLifetime.cs
 create mode 100644 src/Avalonia.Controls/ApplicationLifetimes/ProtocolActivatedEventArgs.cs
 create mode 100644 src/Avalonia.Native/MacOSClassicDesktopStyleApplicationLifetime.cs
 create mode 100644 src/iOS/Avalonia.iOS/SingleViewLifetime.cs

diff --git a/native/Avalonia.Native/src/OSX/app.mm b/native/Avalonia.Native/src/OSX/app.mm
index 88cdf4d9de..7630de1d0b 100644
--- a/native/Avalonia.Native/src/OSX/app.mm
+++ b/native/Avalonia.Native/src/OSX/app.mm
@@ -43,6 +43,22 @@ ComPtr<IAvnApplicationEvents> _events;
     [[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
 }
 
+-(BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag
+{
+    _events->OnReopen();
+    return YES;
+}
+
+- (void)applicationDidHide:(NSNotification *)notification
+{
+    _events->OnHide();
+}
+
+- (void)applicationDidUnhide:(NSNotification *)notification
+{
+    _events->OnUnhide();
+}
+
 - (void)application:(NSApplication *)sender openFiles:(NSArray<NSString *> *)filenames
 {
     auto array = CreateAvnStringArray(filenames);
@@ -123,6 +139,13 @@ extern void ReleaseAvnAppEvents()
     }
 }
 
+HRESULT AvnApplicationCommands::UnhideApp()
+{
+    START_COM_CALL;
+    [[NSApplication sharedApplication] unhide:[NSApp delegate]];
+    return S_OK;
+}
+
 HRESULT AvnApplicationCommands::HideApp()
 {
     START_COM_CALL;
diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h
index 44441ee15d..a3473d3928 100644
--- a/native/Avalonia.Native/src/OSX/common.h
+++ b/native/Avalonia.Native/src/OSX/common.h
@@ -101,6 +101,7 @@ class AvnApplicationCommands : public ComSingleObject<IAvnApplicationCommands, &
 public:
     FORWARD_IUNKNOWN()
     
+    virtual HRESULT UnhideApp() override;
     virtual HRESULT HideApp() override;
     virtual HRESULT ShowAll() override;
     virtual HRESULT HideOthers() override;
diff --git a/samples/ControlCatalog.Android/MainActivity.cs b/samples/ControlCatalog.Android/MainActivity.cs
index 9b5b06e5fb..fce568b15e 100644
--- a/samples/ControlCatalog.Android/MainActivity.cs
+++ b/samples/ControlCatalog.Android/MainActivity.cs
@@ -2,13 +2,16 @@
 using Android.Content.PM;
 using Avalonia;
 using Avalonia.Android;
+using static Android.Content.Intent;
 
 namespace ControlCatalog.Android
 {
-    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", MainLauncher = true, Exported = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+    // IntentFilter are here to test IActivatableApplicationLifetime 
+    [IntentFilter(new [] { ActionView }, Categories = new [] { CategoryDefault, CategoryBrowsable }, DataScheme = "avln" )]
     public class MainActivity : AvaloniaMainActivity<App>
     {
-        protected override Avalonia.AppBuilder CustomizeAppBuilder(Avalonia.AppBuilder builder)
+        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         {
             return base.CustomizeAppBuilder(builder)
                  .AfterSetup(_ =>
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 605254c995..6a941c21ae 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -51,6 +51,14 @@ namespace ControlCatalog
                 singleViewLifetime.MainView = new MainView { DataContext = new MainWindowViewModel() };
             }
 
+            if (ApplicationLifetime is IActivatableApplicationLifetime activatableApplicationLifetime)
+            {
+                activatableApplicationLifetime.Activated += (sender, args) =>
+                    Console.WriteLine($"App activated: {args.Kind}");
+                activatableApplicationLifetime.Deactivated += (sender, args) =>
+                    Console.WriteLine($"App deactivated: {args.Kind}");
+            }
+
             base.OnFrameworkInitializationCompleted();
         }
 
diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.App.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.App.cs
index 3a32c269d7..cf258a5a1f 100644
--- a/src/Android/Avalonia.Android/AvaloniaMainActivity.App.cs
+++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.App.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Android
             {
                 var builder = CreateAppBuilder();
 
-                builder.SetupWithLifetime(new SingleViewLifetime());
+                builder.SetupWithLifetime(new SingleViewLifetime(this));
 
                 s_appBuilder = builder;
             }
diff --git a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
index a4175f864f..b8b3906613 100644
--- a/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
+++ b/src/Android/Avalonia.Android/AvaloniaMainActivity.cs
@@ -7,15 +7,29 @@ using Android.OS;
 using Android.Runtime;
 using Android.Views;
 using AndroidX.AppCompat.App;
+using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Android
 {
-    public class AvaloniaMainActivity : AppCompatActivity, IActivityResultHandler, IActivityNavigationService
+    public class AvaloniaMainActivity : AppCompatActivity, IAvaloniaActivity
     {
+        private EventHandler<ActivatedEventArgs> _onActivated, _onDeactivated;
+        
         public Action<int, Result, Intent> ActivityResult { get; set; }
         public Action<int, string[], Permission[]> RequestPermissionsResult { get; set; }
 
         public event EventHandler<AndroidBackRequestedEventArgs> BackRequested;
+        event EventHandler<ActivatedEventArgs> IAvaloniaActivity.Activated
+        {
+            add { _onActivated += value; }
+            remove { _onActivated -= value; }
+        }
+
+        event EventHandler<ActivatedEventArgs> IAvaloniaActivity.Deactivated
+        {
+            add { _onDeactivated += value; }
+            remove { _onDeactivated -= value; }
+        }
 
         public override void OnBackPressed()
         {
@@ -29,6 +43,30 @@ namespace Avalonia.Android
             }
         }
 
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            base.OnCreate(savedInstanceState);
+            
+            if (Intent?.Data is {} androidUri
+                && androidUri.IsAbsolute
+                && Uri.TryCreate(androidUri.ToString(), UriKind.Absolute, out var protocolUri))
+            {
+                _onActivated?.Invoke(this, new ProtocolActivatedEventArgs(ActivationKind.OpenUri, protocolUri));
+            }
+        }
+
+        protected override void OnStop()
+        {
+            _onDeactivated?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+            base.OnStop();
+        }
+
+        protected override void OnStart()
+        {
+            _onActivated?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+            base.OnStart();
+        }
+
         protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
         {
             base.OnActivityResult(requestCode, resultCode, data);
diff --git a/src/Android/Avalonia.Android/IAndroidNavigationService.cs b/src/Android/Avalonia.Android/IAndroidNavigationService.cs
index 5fa93971d9..b45ee6e78d 100644
--- a/src/Android/Avalonia.Android/IAndroidNavigationService.cs
+++ b/src/Android/Avalonia.Android/IAndroidNavigationService.cs
@@ -1,4 +1,5 @@
 using System;
+using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Android
 {
diff --git a/src/Android/Avalonia.Android/IAvaloniaActivity.cs b/src/Android/Avalonia.Android/IAvaloniaActivity.cs
new file mode 100644
index 0000000000..005096a0bd
--- /dev/null
+++ b/src/Android/Avalonia.Android/IAvaloniaActivity.cs
@@ -0,0 +1,10 @@
+using System;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace Avalonia.Android;
+
+public interface IAvaloniaActivity : IActivityResultHandler, IActivityNavigationService
+{
+    event EventHandler<ActivatedEventArgs> Activated;
+    event EventHandler<ActivatedEventArgs> Deactivated;
+}
diff --git a/src/Android/Avalonia.Android/SingleViewLifetime.cs b/src/Android/Avalonia.Android/SingleViewLifetime.cs
index eef763a932..f8a2ee2894 100644
--- a/src/Android/Avalonia.Android/SingleViewLifetime.cs
+++ b/src/Android/Avalonia.Android/SingleViewLifetime.cs
@@ -1,12 +1,26 @@
-using Avalonia.Controls;
+using System;
+using Android.App;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
 namespace Avalonia.Android
 {
-    internal class SingleViewLifetime : ISingleViewApplicationLifetime
+    internal class SingleViewLifetime : ISingleViewApplicationLifetime, IActivatableApplicationLifetime
     {
+        private readonly Activity _activity;
         private AvaloniaView _view;
 
+        public SingleViewLifetime(Activity activity)
+        {
+            _activity = activity;
+
+            if (activity is IAvaloniaActivity activableActivity)
+            {
+                activableActivity.Activated += (_, args) => Activated?.Invoke(this, args);
+                activableActivity.Deactivated += (_, args) => Deactivated?.Invoke(this, args);
+            }
+        }
+        
         public AvaloniaView View
         {
             get => _view; internal set
@@ -22,5 +36,10 @@ namespace Avalonia.Android
         }
 
         public Control MainView { get; set; }
+        public event EventHandler<ActivatedEventArgs> Activated;
+        public event EventHandler<ActivatedEventArgs> Deactivated;
+
+        public bool TryLeaveBackground() => _activity.MoveTaskToBack(true);
+        public bool TryEnterBackground() => false;
     }
 }
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ActivatedEventArgs.cs b/src/Avalonia.Controls/ApplicationLifetimes/ActivatedEventArgs.cs
new file mode 100644
index 0000000000..fb2eae1b52
--- /dev/null
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ActivatedEventArgs.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace Avalonia.Controls.ApplicationLifetimes;
+
+/// <summary>
+/// Event args for an Application Lifetime Activated or Deactivated events.
+/// </summary>
+public class ActivatedEventArgs : EventArgs
+{
+    /// <summary>
+    /// Ctor for ActivatedEventArgs
+    /// </summary>
+    /// <param name="kind">The <see cref="ActivationKind"/> that this event represents</param>
+    public ActivatedEventArgs(ActivationKind kind)
+    {
+        Kind = kind;
+    }
+      
+    /// <summary>
+    /// The <see cref="ActivationKind"/> that this event represents.
+    /// </summary>
+    public ActivationKind Kind { get; }
+}
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ActivationKind.cs b/src/Avalonia.Controls/ApplicationLifetimes/ActivationKind.cs
new file mode 100644
index 0000000000..6d72b56921
--- /dev/null
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ActivationKind.cs
@@ -0,0 +1,25 @@
+namespace Avalonia.Controls.ApplicationLifetimes;
+
+public enum ActivationKind
+{
+    /// <summary>
+    /// When the application is passed a URI to open.
+    /// </summary>
+    OpenUri = 20, 
+    
+    /// <summary>
+    /// When the application is asked to reopen.
+    /// An example of this is on MacOS when all the windows are closed,
+    /// application continues to run in the background and the user clicks
+    /// the application's dock icon. 
+    /// </summary>
+    Reopen = 30,
+    
+    /// <summary>
+    /// When the application enters or leaves a background state.
+    /// An example is when on MacOS the user hides or shows and application (not window),
+    /// or when a browser application switchs tabs or when a mobile applications goes into
+    /// the background.
+    /// </summary>
+    Background = 40
+}
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
index 77f3b93efa..f235d0e2cf 100644
--- a/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ClassicDesktopStyleApplicationLifetime.cs
@@ -211,11 +211,16 @@ namespace Avalonia
         public static int StartWithClassicDesktopLifetime(
             this AppBuilder builder, string[] args, ShutdownMode shutdownMode = ShutdownMode.OnLastWindowClose)
         {
-            var lifetime = new ClassicDesktopStyleApplicationLifetime()
+            var lifetime = AvaloniaLocator.Current.GetService<ClassicDesktopStyleApplicationLifetime>();
+
+            if (lifetime == null)
             {
-                Args = args,
-                ShutdownMode = shutdownMode
-            };
+                lifetime = new ClassicDesktopStyleApplicationLifetime();
+            }
+
+            lifetime.Args = args;
+            lifetime.ShutdownMode = shutdownMode;
+
             builder.SetupWithLifetime(lifetime);
             return lifetime.Start(args);
         }
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/IActivatableApplicationLifetime.cs b/src/Avalonia.Controls/ApplicationLifetimes/IActivatableApplicationLifetime.cs
new file mode 100644
index 0000000000..fbdfe3aa7d
--- /dev/null
+++ b/src/Avalonia.Controls/ApplicationLifetimes/IActivatableApplicationLifetime.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace Avalonia.Controls.ApplicationLifetimes;
+
+/// <summary>
+/// An interface for ApplicationLifetimes where the application can be Activated and Deactivated.
+/// </summary>
+public interface IActivatableApplicationLifetime
+{
+    /// <summary>
+    /// An event that is raised when the application is Activated for various reasons
+    /// as described by the <see cref="ActivationKind"/> enumeration.
+    /// </summary>
+    event EventHandler<ActivatedEventArgs> Activated;
+    
+    /// <summary>
+    /// An event that is raised when the application is Deactivated for various reasons
+    /// as described by the <see cref="ActivationKind"/> enumeration.
+    /// </summary>
+    event EventHandler<ActivatedEventArgs> Deactivated;
+
+    /// <summary>
+    /// Tells the application that it should attempt to leave its background state.
+    /// For example on OSX this would be [NSApp unhide]
+    /// </summary>
+    /// <returns>true if it was possible and the platform supports this. false otherwise</returns>
+    public bool TryLeaveBackground();
+
+    /// <summary>
+    /// Tells the application that it should attempt to enter its background state.
+    /// For example on OSX this would be [NSApp hide]
+    /// </summary>
+    /// <returns>true if it was possible and the platform supports this. false otherwise</returns>
+    public bool TryEnterBackground();
+}
diff --git a/src/Avalonia.Controls/ApplicationLifetimes/ProtocolActivatedEventArgs.cs b/src/Avalonia.Controls/ApplicationLifetimes/ProtocolActivatedEventArgs.cs
new file mode 100644
index 0000000000..e9706f1cf9
--- /dev/null
+++ b/src/Avalonia.Controls/ApplicationLifetimes/ProtocolActivatedEventArgs.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Avalonia.Controls.ApplicationLifetimes;
+
+public class ProtocolActivatedEventArgs : ActivatedEventArgs
+{
+    public ProtocolActivatedEventArgs(ActivationKind kind, Uri uri) : base(kind)
+    {
+        Uri = uri;
+    }
+
+    public Uri Uri { get; }
+}
diff --git a/src/Avalonia.Controls/Platform/INativeApplicationCommands.cs b/src/Avalonia.Controls/Platform/INativeApplicationCommands.cs
index d837e4155e..d287bf98b5 100644
--- a/src/Avalonia.Controls/Platform/INativeApplicationCommands.cs
+++ b/src/Avalonia.Controls/Platform/INativeApplicationCommands.cs
@@ -5,6 +5,7 @@ namespace Avalonia.Controls.Platform
     /// </summary>
     internal interface INativeApplicationCommands
     {
+        void ShowApp();
         void HideApp();
         void ShowAll();
         void HideOthers();
diff --git a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
index ae24d06bad..3365da7d36 100644
--- a/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
+++ b/src/Avalonia.Native/AvaloniaNativeApplicationPlatform.cs
@@ -13,6 +13,38 @@ namespace Avalonia.Native
         void IAvnApplicationEvents.FilesOpened(IAvnStringArray urls)
         {
             ((IApplicationPlatformEvents)Application.Current).RaiseUrlsOpened(urls.ToStringArray());
+
+            if (Application.Current?.ApplicationLifetime is MacOSClassicDesktopStyleApplicationLifetime lifetime)
+            {
+                foreach (var url in urls.ToStringArray())
+                {
+                    lifetime.RaiseUrl(new Uri(url));
+                }
+            }
+        }
+
+        void IAvnApplicationEvents.OnReopen()
+        {
+            if (Application.Current?.ApplicationLifetime is MacOSClassicDesktopStyleApplicationLifetime lifetime)
+            {
+                lifetime.RaiseActivated(ActivationKind.Reopen);    
+            }
+        }
+
+        void IAvnApplicationEvents.OnHide()
+        {
+            if (Application.Current?.ApplicationLifetime is MacOSClassicDesktopStyleApplicationLifetime lifetime)
+            {
+                lifetime.RaiseDeactivated(ActivationKind.Background);    
+            }
+        }
+
+        void IAvnApplicationEvents.OnUnhide()
+        {
+            if (Application.Current?.ApplicationLifetime is MacOSClassicDesktopStyleApplicationLifetime lifetime)
+            {
+                lifetime.RaiseActivated(ActivationKind.Background);    
+            }
         }
 
         public int TryShutdown()
diff --git a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
index 1d271c9d75..ccd358ff8e 100644
--- a/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
+++ b/src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Native;
 
 namespace Avalonia
@@ -24,6 +25,9 @@ namespace Avalonia
                     });
             });
 
+            AvaloniaLocator.CurrentMutable.Bind<ClassicDesktopStyleApplicationLifetime>()
+                .ToConstant(new MacOSClassicDesktopStyleApplicationLifetime());
+
             return builder;
         }
     }
diff --git a/src/Avalonia.Native/MacOSClassicDesktopStyleApplicationLifetime.cs b/src/Avalonia.Native/MacOSClassicDesktopStyleApplicationLifetime.cs
new file mode 100644
index 0000000000..caf6e03ec8
--- /dev/null
+++ b/src/Avalonia.Native/MacOSClassicDesktopStyleApplicationLifetime.cs
@@ -0,0 +1,50 @@
+using System;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Platform;
+
+namespace Avalonia.Native;
+
+#nullable enable
+
+internal class MacOSClassicDesktopStyleApplicationLifetime : ClassicDesktopStyleApplicationLifetime,
+    IActivatableApplicationLifetime
+{
+    /// <inheritdoc />
+    public event EventHandler<ActivatedEventArgs>? Activated;
+    
+    /// <inheritdoc />
+    public event EventHandler<ActivatedEventArgs>? Deactivated;
+
+    /// <inheritdoc />
+    public bool TryLeaveBackground()
+    {
+        var nativeApplicationCommands = AvaloniaLocator.Current.GetService<INativeApplicationCommands>();
+        nativeApplicationCommands?.ShowApp();
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool TryEnterBackground()
+    {
+        var nativeApplicationCommands = AvaloniaLocator.Current.GetService<INativeApplicationCommands>();
+        nativeApplicationCommands?.HideApp();
+
+        return true;
+    }
+
+    internal void RaiseUrl(Uri uri)
+    {
+        Activated?.Invoke(this, new ProtocolActivatedEventArgs(ActivationKind.OpenUri, uri));
+    }
+    
+    internal void RaiseActivated(ActivationKind kind)
+    {
+        Activated?.Invoke(this, new ActivatedEventArgs(kind));
+    }
+
+    internal void RaiseDeactivated(ActivationKind kind)
+    {
+        Deactivated?.Invoke(this, new ActivatedEventArgs(kind));
+    }
+}
diff --git a/src/Avalonia.Native/MacOSNativeMenuCommands.cs b/src/Avalonia.Native/MacOSNativeMenuCommands.cs
index 6d467d307b..0baca79264 100644
--- a/src/Avalonia.Native/MacOSNativeMenuCommands.cs
+++ b/src/Avalonia.Native/MacOSNativeMenuCommands.cs
@@ -13,6 +13,11 @@ namespace Avalonia.Native
             _commands = commands;
         }
 
+        public void ShowApp()
+        {
+            _commands.UnhideApp();
+        }
+
         public void HideApp()
         {
             _commands.HideApp();
@@ -28,7 +33,6 @@ namespace Avalonia.Native
             _commands.HideOthers();
         }
 
-
         public static readonly AttachedProperty<bool> IsServicesSubmenuProperty =
             AvaloniaProperty.RegisterAttached<MacOSNativeMenuCommands, NativeMenu, bool>("IsServicesSubmenu", false);
     }
diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl
index 7583dfdef6..7791426c0b 100644
--- a/src/Avalonia.Native/avn.idl
+++ b/src/Avalonia.Native/avn.idl
@@ -1087,11 +1087,15 @@ interface IAvnApplicationEvents : IUnknown
 {
      void FilesOpened (IAvnStringArray* urls);
      bool TryShutdown();
+     void OnReopen ();
+     void OnHide ();
+     void OnUnhide ();
 }
 
 [uuid(b4284791-055b-4313-8c2e-50f0a8c72ce9)]
 interface IAvnApplicationCommands : IUnknown
 {
+    HRESULT UnhideApp();
     HRESULT HideApp();
     HRESULT ShowAll();
     HRESULT HideOthers();
diff --git a/src/Browser/Avalonia.Browser/BrowserAppBuilder.cs b/src/Browser/Avalonia.Browser/BrowserAppBuilder.cs
index 996faaec58..eaa72c1931 100644
--- a/src/Browser/Avalonia.Browser/BrowserAppBuilder.cs
+++ b/src/Browser/Avalonia.Browser/BrowserAppBuilder.cs
@@ -75,8 +75,9 @@ public static class BrowserAppBuilder
     {
         builder = await PreSetupBrowser(builder, options);
 
+        var lifetime = new BrowserSingleViewLifetime();
         builder
-            .SetupWithoutStarting();
+            .SetupWithLifetime(lifetime);
     }
 
     internal static async Task<AppBuilder> PreSetupBrowser(AppBuilder builder, BrowserPlatformOptions? options)
diff --git a/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs b/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs
index 6fa79f6f54..6607bcf539 100644
--- a/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs
+++ b/src/Browser/Avalonia.Browser/BrowserSingleViewLifetime.cs
@@ -4,11 +4,34 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using System.Runtime.Versioning;
 using Avalonia.Browser;
+using Avalonia.Browser.Interop;
+using Avalonia.Threading;
 
 namespace Avalonia;
 
-internal class BrowserSingleViewLifetime : ISingleViewApplicationLifetime
+internal class BrowserSingleViewLifetime : ISingleViewApplicationLifetime, IActivatableApplicationLifetime
 {
+    public BrowserSingleViewLifetime()
+    {
+        bool? initiallyVisible = InputHelper.SubscribeVisibilityChange(visible =>
+        {
+            initiallyVisible = null;
+            (visible ? Activated : Deactivated)?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+        });
+
+        // Trigger Activated as an initial state, if web page is visible, and wasn't hidden during initialization.
+        if (initiallyVisible == true)
+        {
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                if (initiallyVisible == true)
+                {
+                    Activated?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+                }
+            });
+        }
+    }
+    
     public AvaloniaView? View;
 
     public Control? MainView
@@ -33,4 +56,10 @@ internal class BrowserSingleViewLifetime : ISingleViewApplicationLifetime
             throw new InvalidOperationException("Browser lifetime was not initialized. Make sure AppBuilder.StartBrowserApp was called.");
         }
     }
+
+    public event EventHandler<ActivatedEventArgs>? Activated;
+    public event EventHandler<ActivatedEventArgs>? Deactivated;
+
+    public bool TryLeaveBackground() => false;
+    public bool TryEnterBackground() => true;
 }
diff --git a/src/Browser/Avalonia.Browser/Interop/InputHelper.cs b/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
index 9fc0df28d8..7f294e155e 100644
--- a/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
+++ b/src/Browser/Avalonia.Browser/Interop/InputHelper.cs
@@ -50,11 +50,14 @@ internal static partial class InputHelper
     [JSImport("InputHelper.subscribeDropEvents", AvaloniaModule.MainModuleName)]
     public static partial void SubscribeDropEvents(JSObject containerElement,
         [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>] Func<JSObject, bool> dragEvent);
-    
+
     [JSImport("InputHelper.subscribeKeyboardGeometryChange", AvaloniaModule.MainModuleName)]
     public static partial void SubscribeKeyboardGeometryChange(JSObject containerElement,
         [JSMarshalAs<JSType.Function<JSType.Object, JSType.Boolean>>] Func<JSObject, bool> handler);
 
+    [JSImport("InputHelper.subscribeVisibilityChange", AvaloniaModule.MainModuleName)]
+    public static partial bool SubscribeVisibilityChange([JSMarshalAs<JSType.Function<JSType.Boolean>>] Action<bool> handler);
+
     [JSImport("InputHelper.getCoalescedEvents", AvaloniaModule.MainModuleName)]
     [return: JSMarshalAs<JSType.Array<JSType.Object>>]
     public static partial JSObject[] GetCoalescedEvents(JSObject pointerEvent);
diff --git a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
index 99439b6034..e03aa9e532 100644
--- a/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
+++ b/src/Browser/Avalonia.Browser/webapp/modules/avalonia/input.ts
@@ -263,6 +263,14 @@ export class InputHelper {
         }
     }
 
+    public static subscribeVisibilityChange(
+        handler: (state: boolean) => void): boolean {
+        document.addEventListener("visibilitychange", () => {
+            handler(document.visibilityState === "visible");
+        });
+        return document.visibilityState === "visible";
+    }
+
     public static clearInput(inputElement: HTMLInputElement) {
         inputElement.value = "";
     }
diff --git a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
index c1e7cd5aba..ecb9e56aa9 100644
--- a/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
+++ b/src/iOS/Avalonia.iOS/AvaloniaAppDelegate.cs
@@ -1,25 +1,39 @@
+using System;
 using Foundation;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
 using UIKit;
 
 namespace Avalonia.iOS
 {
-    public class AvaloniaAppDelegate<TApp> : UIResponder, IUIApplicationDelegate
+    public interface IAvaloniaAppDelegate
+    {
+        event EventHandler<ActivatedEventArgs> Activated;
+        event EventHandler<ActivatedEventArgs> Deactivated;
+    }
+
+    public class AvaloniaAppDelegate<TApp> : UIResponder, IUIApplicationDelegate, IAvaloniaAppDelegate
         where TApp : Application, new()
     {
-        class SingleViewLifetime : ISingleViewApplicationLifetime
-        {
-            public AvaloniaView View;
+        private EventHandler<ActivatedEventArgs> _onActivated, _onDeactivated;
 
-            public Control MainView
-            {
-                get => View.Content;
-                set => View.Content = value;
-            }
+        public AvaloniaAppDelegate()
+        {
+            NSNotificationCenter.DefaultCenter.AddObserver(UIApplication.DidEnterBackgroundNotification, OnEnteredBackground);
+            NSNotificationCenter.DefaultCenter.AddObserver(UIApplication.WillEnterForegroundNotification, OnLeavingBackground);
         }
 
+        event EventHandler<ActivatedEventArgs> IAvaloniaAppDelegate.Activated
+        {
+            add { _onActivated += value; }
+            remove { _onActivated -= value; }
+        }
+        event EventHandler<ActivatedEventArgs> IAvaloniaAppDelegate.Deactivated
+        {
+            add { _onDeactivated += value; }
+            remove { _onDeactivated -= value; }
+        }
+        
         protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
         
         [Export("window")]
@@ -30,7 +44,7 @@ namespace Avalonia.iOS
         {
             var builder = AppBuilder.Configure<TApp>().UseiOS();
 
-            var lifetime = new SingleViewLifetime();
+            var lifetime = new SingleViewLifetime(this);
 
             builder.AfterSetup(_ =>
             {
@@ -54,5 +68,27 @@ namespace Avalonia.iOS
 
             return true;
         }
+
+        [Export("application:openURL:options:")]
+        public bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
+        {
+            if (Uri.TryCreate(url.ToString(), UriKind.Absolute, out var uri))
+            {
+                _onActivated?.Invoke(this, new ProtocolActivatedEventArgs(ActivationKind.OpenUri, uri));
+                return true;
+            }
+
+            return false;
+        }
+
+        private void OnEnteredBackground(NSNotification notification)
+        {
+            _onDeactivated?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+        }
+
+        private void OnLeavingBackground(NSNotification notification)
+        {
+            _onActivated?.Invoke(this, new ActivatedEventArgs(ActivationKind.Background));
+        }
     }
 }
diff --git a/src/iOS/Avalonia.iOS/SingleViewLifetime.cs b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
new file mode 100644
index 0000000000..d3924482e4
--- /dev/null
+++ b/src/iOS/Avalonia.iOS/SingleViewLifetime.cs
@@ -0,0 +1,27 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace Avalonia.iOS;
+
+internal class SingleViewLifetime : ISingleViewApplicationLifetime, IActivatableApplicationLifetime
+{
+    public SingleViewLifetime(IAvaloniaAppDelegate avaloniaAppDelegate)
+    {
+        avaloniaAppDelegate.Activated += (_, args) => Activated?.Invoke(this, args);
+        avaloniaAppDelegate.Deactivated += (_, args) => Deactivated?.Invoke(this, args);
+    }
+            
+    public AvaloniaView View;
+
+    public Control MainView
+    {
+        get => View.Content;
+        set => View.Content = value;
+    }
+
+    public event EventHandler<ActivatedEventArgs> Activated;
+    public event EventHandler<ActivatedEventArgs> Deactivated;
+    public bool TryLeaveBackground() => false;
+    public bool TryEnterBackground() => false;
+}

From c8bd858e18162a9062db0a2a20e8b7b32b038a80 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Wed, 10 Jan 2024 18:33:09 +0000
Subject: [PATCH 32/33] fix text selection handles crash on reattach to visual
 tree (#14096)

Co-authored-by: Tim <47110241+timunie@users.noreply.github.com>
---
 .../Presenters/TextPresenter.cs               | 20 +++++++++----------
 .../Primitives/TextSelectionCanvas.cs         |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index 9a89ccaf28..37fbbaa2e9 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -595,12 +595,6 @@ namespace Avalonia.Controls.Presenters
             InvalidateMeasure();
         }
 
-        protected override void OnLoaded(RoutedEventArgs e)
-        {
-            base.OnLoaded(e);
-            EnsureTextSelectionLayer();
-        }
-
         protected override Size MeasureOverride(Size availableSize)
         {
             _constraint = availableSize;
@@ -894,8 +888,7 @@ namespace Avalonia.Controls.Presenters
 
             ResetCaretTimer();
 
-            if (TextSelectionHandleCanvas is { } canvas && _layer != null && !_layer.Children.Contains(canvas))
-                _layer?.Add(TextSelectionHandleCanvas);
+            EnsureTextSelectionLayer();
         }
 
         private void EnsureTextSelectionLayer()
@@ -903,10 +896,17 @@ namespace Avalonia.Controls.Presenters
             if (TextSelectionHandleCanvas == null)
             {
                 TextSelectionHandleCanvas = new TextSelectionHandleCanvas();
-                TextSelectionHandleCanvas.SetPresenter(this);
             }
+            TextSelectionHandleCanvas.SetPresenter(this);
             _layer = TextSelectorLayer.GetTextSelectorLayer(this);
-            if (_layer != null && !_layer.Children.Contains(TextSelectionHandleCanvas))
+            if (TextSelectionHandleCanvas.VisualParent is { } parent && parent != _layer)
+            {
+                if (parent is TextSelectorLayer l)
+                {
+                    l.Remove(TextSelectionHandleCanvas);
+                }
+            }
+            if (_layer != null && TextSelectionHandleCanvas.VisualParent != _layer)
                 _layer?.Add(TextSelectionHandleCanvas);
         }
 
diff --git a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
index c9a58aed0b..07e48653d7 100644
--- a/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
+++ b/src/Avalonia.Controls/Primitives/TextSelectionCanvas.cs
@@ -250,6 +250,8 @@ namespace Avalonia.Controls.Primitives
 
         internal void SetPresenter(TextPresenter? textPresenter)
         {
+            if (_presenter == textPresenter)
+                return;
             _presenter = textPresenter;
             if (_presenter != null)
             {

From 29f4056693a57d6d7380d03611fe7c08d26113b2 Mon Sep 17 00:00:00 2001
From: Mike James <michael.james6@gmail.com>
Date: Wed, 10 Jan 2024 22:29:30 +0100
Subject: [PATCH 33/33] Update readme.md (#14168)

Updated our sponsors section to reflect 2024 sponsors.
---
 readme.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/readme.md b/readme.md
index b92d382859..7a412f282c 100644
--- a/readme.md
+++ b/readme.md
@@ -106,18 +106,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/Avalonia#sponsor)]
 
-<a href="https://opencollective.com/Avalonia/sponsor/0/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/1/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/2/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/3/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/4/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/5/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/6/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/7/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/8/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/Avalonia/sponsor/9/website" target="_blank"><img src="https://opencollective.com/Avalonia/sponsor/9/avatar.svg"></a>
-<a href="https://baseheadinc.com/" target="_blank"><img height="50" src="https://baseheadinc.com/wp-content/uploads/2020/09/BH-Logo-for-Site-Header-New.png"></a>
-
 <a href="https://aws.amazon.com/developer/language/net/" target="_blank"><img src="https://github.com/AvaloniaUI/Avalonia/assets/552074/7771d8b9-ef84-4503-9889-033a87d2c852"></a>
 
 ## Commercial Support