From 2d7c8645d0e82ed71edce10472bb5d5b1360d1d2 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Mon, 21 Nov 2022 01:14:43 +0600
Subject: [PATCH 01/10] Recalculate parent's child render nodes on visual tree
 attachment

---
 src/Avalonia.Base/Visual.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs
index 69389def56..51fc143f72 100644
--- a/src/Avalonia.Base/Visual.cs
+++ b/src/Avalonia.Base/Visual.cs
@@ -432,6 +432,7 @@ namespace Avalonia
             OnAttachedToVisualTree(e);
             AttachedToVisualTree?.Invoke(this, e);
             InvalidateVisual();
+            _visualRoot.Renderer.RecalculateChildren(_visualParent!);
 
             if (ZIndex != 0 && this.GetVisualParent() is Visual parent)
                 parent.HasNonUniformZIndexChildren = true;

From f4898667345648ac27b08a8e77626fcda6971d0f Mon Sep 17 00:00:00 2001
From: zhouzj <comesx4@gmail.com>
Date: Thu, 1 Dec 2022 16:28:34 +0800
Subject: [PATCH 02/10] Replace ContentControl to ContentPresenter

---
 .../Controls/CalendarButton.xaml               | 16 ++++++++--------
 .../Controls/CalendarButton.xaml               | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
index 06b6cf30c2..76b51ca819 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CalendarButton.xaml
@@ -35,13 +35,13 @@
           <!-- To mimic WinUI SystemFocusVisual, Focus visual is drawn outside the bounds of the item -->
           <Border Name="Root" Background="{TemplateBinding Background}"
                   BorderThickness="0" ClipToBounds="True">
-            <ContentControl Name="Content"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            Content="{TemplateBinding Content}"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            FontSize="{TemplateBinding FontSize}"
-                            Margin="{TemplateBinding Padding}" />
+            <ContentPresenter Name="Content"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              Content="{TemplateBinding Content}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                              FontSize="{TemplateBinding FontSize}"
+                              Margin="{TemplateBinding Padding}" />
           </Border>
 
           <!-- Drawn Border should render on top of background to preserve the 1px margin between items -->
@@ -70,7 +70,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource CalendarViewSelectedBorderBrush}" />
       </Style>
 
-      <Style Selector="^ /template/ ContentControl#Content">
+      <Style Selector="^ /template/ ContentPresenter#Content">
         <Setter Property="Foreground" Value="{DynamicResource CalendarViewTodayForeground}" />
         <Setter Property="FontWeight" Value="SemiBold" />
       </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
index 59fb24663f..9e13e1e996 100644
--- a/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CalendarButton.xaml
@@ -32,14 +32,14 @@
                      Opacity="0.5" />
 
           <!--  Focusable="False"  -->
-          <ContentControl Name="Content"
-                          Margin="1,0,1,1"
-                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                          Content="{TemplateBinding Content}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          FontSize="{TemplateBinding FontSize}"
-                          Foreground="{TemplateBinding Foreground}" />
+          <ContentPresenter Name="Content"
+                            Margin="1,0,1,1"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            FontSize="{TemplateBinding FontSize}"
+                            Foreground="{TemplateBinding Foreground}" />
 
           <Rectangle Name="FocusVisual"
                      IsHitTestVisible="False"
@@ -62,7 +62,7 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <Style Selector="^:inactive /template/ ContentControl#Content">
+    <Style Selector="^:inactive /template/ ContentPresenter#Content">
       <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
     </Style>
 

From 4f472a10d680ccad8dd288b27c2507c72e964e59 Mon Sep 17 00:00:00 2001
From: zhouzj <comesx4@gmail.com>
Date: Thu, 1 Dec 2022 18:04:22 +0800
Subject: [PATCH 03/10] if the slider is disabled while sliding, prevent the
 track sliding

---
 src/Avalonia.Controls/Slider.cs               | 20 ++++++----
 .../Controls/Slider.xaml                      | 39 +++++++++----------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/Avalonia.Controls/Slider.cs b/src/Avalonia.Controls/Slider.cs
index be87705b54..4b23717209 100644
--- a/src/Avalonia.Controls/Slider.cs
+++ b/src/Avalonia.Controls/Slider.cs
@@ -190,7 +190,7 @@ namespace Avalonia.Controls
             _increaseButtonSubscription?.Dispose();
             _increaseButtonReleaseDispose?.Dispose();
             _pointerMovedDispose?.Dispose();
-            
+
             _decreaseButton = e.NameScope.Find<Button>("PART_DecreaseButton");
             _track = e.NameScope.Find<Track>("PART_Track");
             _increaseButton = e.NameScope.Find<Button>("PART_IncreaseButton");
@@ -258,7 +258,7 @@ namespace Avalonia.Controls
 
             e.Handled = handled;
         }
-            
+
         private void MoveToNextTick(double direction)
         {
             if (direction == 0.0) return;
@@ -317,6 +317,12 @@ namespace Avalonia.Controls
 
         private void TrackMoved(object? sender, PointerEventArgs e)
         {
+            if (!IsEnabled)
+            {
+                _isDragging = false;
+                return;
+            }
+
             if (_isDragging)
             {
                 MoveToPoint(e.GetCurrentPoint(_track));
@@ -343,15 +349,15 @@ namespace Avalonia.Controls
                 return;
 
             var orient = Orientation == Orientation.Horizontal;
-            var thumbLength = (orient 
-                ? _track.Thumb.Bounds.Width 
+            var thumbLength = (orient
+                ? _track.Thumb.Bounds.Width
                 : _track.Thumb.Bounds.Height) + double.Epsilon;
-            var trackLength = (orient 
-                ? _track.Bounds.Width 
+            var trackLength = (orient
+                ? _track.Bounds.Width
                 : _track.Bounds.Height) - thumbLength;
             var trackPos = orient ? posOnTrack.Position.X : posOnTrack.Position.Y;
             var logicalPos = MathUtilities.Clamp((trackPos - thumbLength * 0.5) / trackLength, 0.0d, 1.0d);
-            var invert = orient ? 
+            var invert = orient ?
                 IsDirectionReversed ? 1 : 0 :
                 IsDirectionReversed ? 0 : 1;
             var calcVal = Math.Abs(invert - logicalPos);
diff --git a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index f2351dd5be..fe5b7f902c 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
@@ -302,26 +302,6 @@
       <Setter Property="IsVisible" Value="True" />
     </Style>
 
-    <!--  Disabled State  -->
-
-    <Style Selector="^:disabled">
-      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
-        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
-        <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ Thumb">
-        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
-      </Style>
-
-      <Style Selector="^ /template/ TickBar">
-        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
-      </Style>
-    </Style>
-
     <!--  PointerOver State  -->
     <Style Selector="^:pointerover">
       <Style Selector="^ /template/ Grid#SliderContainer">
@@ -362,6 +342,25 @@
       </Style>
     </Style>
 
+    <!--  Disabled State  -->
+    <Style Selector="^:disabled">
+      <Style Selector="^ /template/ RepeatButton#PART_DecreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackValueFillDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
+        <Setter Property="Background" Value="{DynamicResource SliderTrackFillDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ Thumb">
+        <Setter Property="Background" Value="{DynamicResource SliderThumbBackgroundDisabled}" />
+      </Style>
+
+      <Style Selector="^ /template/ TickBar">
+        <Setter Property="Fill" Value="{DynamicResource SliderTickBarFillDisabled}" />
+      </Style>
+    </Style>
+
     <Style Selector="^:error">
       <Setter Property="Foreground" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
       <Style Selector="^ /template/ Thumb">

From 18781d62ce8ba4566f512bc904200b3c3b9502fc Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 1 Dec 2022 19:44:07 +0300
Subject: [PATCH 04/10] Null check

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

diff --git a/src/Avalonia.Base/Visual.cs b/src/Avalonia.Base/Visual.cs
index be1ba05c71..7694119589 100644
--- a/src/Avalonia.Base/Visual.cs
+++ b/src/Avalonia.Base/Visual.cs
@@ -417,7 +417,7 @@ namespace Avalonia
             OnAttachedToVisualTree(e);
             AttachedToVisualTree?.Invoke(this, e);
             InvalidateVisual();
-            _visualRoot.Renderer.RecalculateChildren(_visualParent!);
+            _visualRoot.Renderer?.RecalculateChildren(_visualParent!);
 
             if (ZIndex != 0 && VisualParent is Visual parent)
                 parent.HasNonUniformZIndexChildren = true;

From 9be5c31bb0125194739268b7d831b31d3f9a3b13 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 1 Dec 2022 18:11:46 +0100
Subject: [PATCH 05/10] fix: XML Document CA1574

---
 src/Avalonia.Base/Animation/CrossFade.cs                  | 2 +-
 src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs     | 2 +-
 src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs   | 2 +-
 src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs | 2 +-
 src/Avalonia.Base/Media/MatrixTransform.cs                | 2 +-
 src/Avalonia.Base/Media/RotateTransform.cs                | 2 +-
 src/Avalonia.Base/Media/ScaleTransform.cs                 | 2 +-
 src/Avalonia.Base/Media/SkewTransform.cs                  | 2 +-
 src/Avalonia.Base/Media/Transform.cs                      | 2 +-
 src/Avalonia.Base/Media/TranslateTransform.cs             | 2 +-
 src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs      | 2 +-
 src/Avalonia.Base/Styling/Activators/IStyleActivator.cs   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avalonia.Base/Animation/CrossFade.cs b/src/Avalonia.Base/Animation/CrossFade.cs
index 608a0880ec..a229bc7ce6 100644
--- a/src/Avalonia.Base/Animation/CrossFade.cs
+++ b/src/Avalonia.Base/Animation/CrossFade.cs
@@ -10,7 +10,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Animation
 {
     /// <summary>
-    /// Defines a cross-fade animation between two <see cref="IVisual"/>s.
+    /// Defines a cross-fade animation between two <see cref="Visual"/>s.
     /// </summary>
     public class CrossFade : IPageTransition
     {
diff --git a/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
index c4508c3f5c..d56711ad68 100644
--- a/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
+++ b/src/Avalonia.Base/Media/Imaging/RenderTargetBitmap.cs
@@ -7,7 +7,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media.Imaging
 {
     /// <summary>
-    /// A bitmap that holds the rendering of a <see cref="IVisual"/>.
+    /// A bitmap that holds the rendering of a <see cref="Visual"/>.
     /// </summary>
     public class RenderTargetBitmap : Bitmap, IDisposable, IRenderTarget
     {
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
index d5ff2b8317..4478504eca 100644
--- a/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableTransform.cs
@@ -3,7 +3,7 @@
 namespace Avalonia.Media.Immutable
 {
     /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
+    /// Represents a transform on an <see cref="Visual"/>.
     /// </summary>
     public class ImmutableTransform : ITransform
     {
diff --git a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
index 1e0133c9b7..9b443391c5 100644
--- a/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
+++ b/src/Avalonia.Base/Media/Immutable/ImmutableVisualBrush.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media.Immutable
 {
     /// <summary>
-    /// Paints an area with an <see cref="IVisual"/>.
+    /// Paints an area with an <see cref="Visual"/>.
     /// </summary>
     internal class ImmutableVisualBrush : ImmutableTileBrush, IVisualBrush
     {
diff --git a/src/Avalonia.Base/Media/MatrixTransform.cs b/src/Avalonia.Base/Media/MatrixTransform.cs
index 4e60e1e290..c61acb730c 100644
--- a/src/Avalonia.Base/Media/MatrixTransform.cs
+++ b/src/Avalonia.Base/Media/MatrixTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Transforms an <see cref="IVisual"/> according to a <see cref="Matrix"/>.
+    /// Transforms an <see cref="Visual"/> according to a <see cref="Matrix"/>.
     /// </summary>
     public class MatrixTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/RotateTransform.cs b/src/Avalonia.Base/Media/RotateTransform.cs
index 126bb7c274..3bd409149c 100644
--- a/src/Avalonia.Base/Media/RotateTransform.cs
+++ b/src/Avalonia.Base/Media/RotateTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Rotates an <see cref="IVisual"/>.
+    /// Rotates an <see cref="Visual"/>.
     /// </summary>
     public class RotateTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/ScaleTransform.cs b/src/Avalonia.Base/Media/ScaleTransform.cs
index 259b23cbd2..d4c1a7f993 100644
--- a/src/Avalonia.Base/Media/ScaleTransform.cs
+++ b/src/Avalonia.Base/Media/ScaleTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Scale an <see cref="IVisual"/>.
+    /// Scale an <see cref="Visual"/>.
     /// </summary>
     public class ScaleTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/SkewTransform.cs b/src/Avalonia.Base/Media/SkewTransform.cs
index a96710e331..066f5371c3 100644
--- a/src/Avalonia.Base/Media/SkewTransform.cs
+++ b/src/Avalonia.Base/Media/SkewTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Skews an <see cref="IVisual"/>.
+    /// Skews an <see cref="Visual"/>.
     /// </summary>
     public class SkewTransform : Transform
     {
diff --git a/src/Avalonia.Base/Media/Transform.cs b/src/Avalonia.Base/Media/Transform.cs
index 023a8b9cdd..85393ab189 100644
--- a/src/Avalonia.Base/Media/Transform.cs
+++ b/src/Avalonia.Base/Media/Transform.cs
@@ -7,7 +7,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Represents a transform on an <see cref="IVisual"/>.
+    /// Represents a transform on an <see cref="Visual"/>.
     /// </summary>
     public abstract class Transform : Animatable, IMutableTransform
     {
diff --git a/src/Avalonia.Base/Media/TranslateTransform.cs b/src/Avalonia.Base/Media/TranslateTransform.cs
index d6d6809f3d..0f910f3600 100644
--- a/src/Avalonia.Base/Media/TranslateTransform.cs
+++ b/src/Avalonia.Base/Media/TranslateTransform.cs
@@ -4,7 +4,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Media
 {
     /// <summary>
-    /// Translates (moves) an <see cref="IVisual"/>.
+    /// Translates (moves) an <see cref="Visual"/>.
     /// </summary>
     public class TranslateTransform : Transform
     {
diff --git a/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
index 4eec214f4f..a991f2f657 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/VisualNode.cs
@@ -10,7 +10,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Rendering.SceneGraph
 {
     /// <summary>
-    /// A node in the low-level scene graph representing an <see cref="IVisual"/>.
+    /// A node in the low-level scene graph representing an <see cref="Visual"/>.
     /// </summary>
     internal class VisualNode : IVisualNode
     {
diff --git a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
index e07534237a..487198a861 100644
--- a/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
+++ b/src/Avalonia.Base/Styling/Activators/IStyleActivator.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Styling.Activators
         /// </summary>
         /// <param name="sink">The listener.</param>
         /// <remarks>
-        /// This method should not call <see cref="IStyleActivatorSink.OnNext(bool, int)"/>.
+        /// This method should not call <see cref="IStyleActivatorSink.OnNext(bool)"/>.
         /// </remarks>
         void Subscribe(IStyleActivatorSink sink);
 

From f446f7c7b8639a1f2c08924bdd33d23917fd2a65 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 3 Nov 2022 17:44:36 +0100
Subject: [PATCH 06/10] fix: disable analyzers for Samples

---
 samples/Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 8fc91aca14..471c42ec07 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -4,4 +4,7 @@
       <AvaloniaPreviewerNetCoreToolPath>$(MSBuildThisFileDirectory)..\src\tools\Avalonia.Designer.HostApp\bin\Debug\netcoreapp2.0\Avalonia.Designer.HostApp.dll</AvaloniaPreviewerNetCoreToolPath>
   </PropertyGroup>
   <Import Project="..\build\SharedVersion.props" />
+  <PropertyGroup>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>  
 </Project>

From 1bb84cab7c30e607f7d756fb330c15e0945cc1c9 Mon Sep 17 00:00:00 2001
From: robloo <robloo@users.noreply.github.com>
Date: Thu, 1 Dec 2022 20:13:08 -0500
Subject: [PATCH 07/10] Ensure invariant culture in relevant string
 interpolation

---
 src/Avalonia.Base/CornerRadius.cs             |  2 +-
 src/Avalonia.Base/Media/ArcSegment.cs         |  5 +++--
 src/Avalonia.Base/Media/BezierSegment .cs     |  6 ++++--
 src/Avalonia.Base/Media/BoxShadow.cs          |  8 ++++----
 src/Avalonia.Base/Media/LineSegment.cs        |  6 ++++--
 src/Avalonia.Base/Media/PathFigure.cs         |  2 +-
 src/Avalonia.Base/Media/PathGeometry.cs       |  2 +-
 .../Media/QuadraticBezierSegment .cs          |  6 ++++--
 src/Avalonia.Base/RelativePoint.cs            |  2 +-
 .../Composition/Server/FpsCounter.cs          |  2 +-
 .../Server/ServerCompositionTarget.cs         |  2 +-
 .../Rendering/DeferredRenderer.cs             |  2 +-
 src/Avalonia.Base/Rendering/RendererBase.cs   |  2 +-
 src/Avalonia.Base/Thickness.cs                |  2 +-
 .../VisualTree/TransformedBounds.cs           |  2 +-
 src/Avalonia.Build.Tasks/Extensions.cs        |  2 +-
 .../GenerateAvaloniaResourcesTask.cs          |  2 +-
 .../DateTimePickers/DateTimePickerPanel.cs    |  2 +-
 src/Avalonia.Controls/Selection/IndexRange.cs |  2 +-
 .../Remote/HtmlTransport/HtmlTransport.cs     |  2 +-
 .../SimpleWebSocketHttpServer.cs              |  2 +-
 src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs  |  2 +-
 src/Browser/Avalonia.Browser/Cursor.cs        | 20 +++++++++----------
 .../CompiledBindings/CompiledBindingPath.cs   |  4 ++--
 .../FindVisualAncestorNode.cs                 |  4 ++--
 25 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/Avalonia.Base/CornerRadius.cs b/src/Avalonia.Base/CornerRadius.cs
index 893f7c4565..d56a0ef19d 100644
--- a/src/Avalonia.Base/CornerRadius.cs
+++ b/src/Avalonia.Base/CornerRadius.cs
@@ -100,7 +100,7 @@ namespace Avalonia
 
         public override string ToString()
         {
-            return $"{TopLeft},{TopRight},{BottomRight},{BottomLeft}";
+            return FormattableString.Invariant($"{TopLeft},{TopRight},{BottomRight},{BottomLeft}");
         }
 
         public static CornerRadius Parse(string s)
diff --git a/src/Avalonia.Base/Media/ArcSegment.cs b/src/Avalonia.Base/Media/ArcSegment.cs
index 888cb896bb..b7dbd4925b 100644
--- a/src/Avalonia.Base/Media/ArcSegment.cs
+++ b/src/Avalonia.Base/Media/ArcSegment.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Globalization;
 
 namespace Avalonia.Media
@@ -100,6 +101,6 @@ namespace Avalonia.Media
         }
 
         public override string ToString()
-            => $"A {Size} {RotationAngle.ToString(CultureInfo.InvariantCulture)} {(IsLargeArc ? 1 : 0)} {(int)SweepDirection} {Point}";
+            => FormattableString.Invariant($"A {Size} {RotationAngle} {(IsLargeArc ? 1 : 0)} {(int)SweepDirection} {Point}");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Media/BezierSegment .cs b/src/Avalonia.Base/Media/BezierSegment .cs
index d4330830d9..64ea2924cc 100644
--- a/src/Avalonia.Base/Media/BezierSegment .cs	
+++ b/src/Avalonia.Base/Media/BezierSegment .cs	
@@ -1,3 +1,5 @@
+using System;
+
 namespace Avalonia.Media
 {
     public sealed class BezierSegment : PathSegment
@@ -60,6 +62,6 @@ namespace Avalonia.Media
         }
 
         public override string ToString()
-            => $"C {Point1} {Point2} {Point3}";
+            => FormattableString.Invariant($"C {Point1} {Point2} {Point3}");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Media/BoxShadow.cs b/src/Avalonia.Base/Media/BoxShadow.cs
index cc97d89cfc..2139516be6 100644
--- a/src/Avalonia.Base/Media/BoxShadow.cs
+++ b/src/Avalonia.Base/Media/BoxShadow.cs
@@ -94,22 +94,22 @@ namespace Avalonia.Media
 
             if (OffsetX != 0.0)
             {
-                sb.AppendFormat(" {0}", OffsetX.ToString());
+                sb.AppendFormat(" {0}", OffsetX.ToString(CultureInfo.InvariantCulture));
             }
 
             if (OffsetY != 0.0)
             {
-                sb.AppendFormat(" {0}", OffsetY.ToString());
+                sb.AppendFormat(" {0}", OffsetY.ToString(CultureInfo.InvariantCulture));
             }
             
             if (Blur != 0.0)
             {
-                sb.AppendFormat(" {0}", Blur.ToString());
+                sb.AppendFormat(" {0}", Blur.ToString(CultureInfo.InvariantCulture));
             }
 
             if (Spread != 0.0)
             {
-                sb.AppendFormat(" {0}", Spread.ToString());
+                sb.AppendFormat(" {0}", Spread.ToString(CultureInfo.InvariantCulture));
             }
 
             sb.AppendFormat(" {0}", Color.ToString());
diff --git a/src/Avalonia.Base/Media/LineSegment.cs b/src/Avalonia.Base/Media/LineSegment.cs
index 49d9ebeb72..5729ab2c3b 100644
--- a/src/Avalonia.Base/Media/LineSegment.cs
+++ b/src/Avalonia.Base/Media/LineSegment.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace Avalonia.Media
 {
     public sealed class LineSegment : PathSegment
@@ -26,6 +28,6 @@ namespace Avalonia.Media
         }
 
         public override string ToString()
-            => $"L {Point}";
+            => FormattableString.Invariant($"L {Point}");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/Media/PathFigure.cs b/src/Avalonia.Base/Media/PathFigure.cs
index caf86cb234..e1b5e8b504 100644
--- a/src/Avalonia.Base/Media/PathFigure.cs
+++ b/src/Avalonia.Base/Media/PathFigure.cs
@@ -126,7 +126,7 @@ namespace Avalonia.Media
         }
         
         public override string ToString()
-            => $"M {StartPoint} {string.Join(" ", _segments ?? Enumerable.Empty<PathSegment>())}{(IsClosed ? "Z" : "")}";
+            => FormattableString.Invariant($"M {StartPoint} {string.Join(" ", _segments ?? Enumerable.Empty<PathSegment>())}{(IsClosed ? "Z" : "")}");
 
         internal void ApplyTo(StreamGeometryContext ctx)
         {
diff --git a/src/Avalonia.Base/Media/PathGeometry.cs b/src/Avalonia.Base/Media/PathGeometry.cs
index 2c8a51c541..8292afde7e 100644
--- a/src/Avalonia.Base/Media/PathGeometry.cs
+++ b/src/Avalonia.Base/Media/PathGeometry.cs
@@ -133,7 +133,7 @@ namespace Avalonia.Media
         public override string ToString()
         {
             var figuresString = _figures is not null ? string.Join(" ", _figures) : string.Empty;
-            return $"{(FillRule != FillRule.EvenOdd ? "F1 " : "")}{figuresString}";
+            return FormattableString.Invariant($"{(FillRule != FillRule.EvenOdd ? "F1 " : "")}{figuresString}");
         }
     }
 }
diff --git a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs
index f1a0ccaaa0..9dc24e2a93 100644
--- a/src/Avalonia.Base/Media/QuadraticBezierSegment .cs	
+++ b/src/Avalonia.Base/Media/QuadraticBezierSegment .cs	
@@ -1,3 +1,5 @@
+using System;
+
 namespace Avalonia.Media
 {
     public sealed class QuadraticBezierSegment : PathSegment
@@ -44,6 +46,6 @@ namespace Avalonia.Media
         }
 
         public override string ToString()
-            => $"Q {Point1} {Point2}";
+            => FormattableString.Invariant($"Q {Point1} {Point2}");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Avalonia.Base/RelativePoint.cs b/src/Avalonia.Base/RelativePoint.cs
index e1fd0093b6..71c6a5cc15 100644
--- a/src/Avalonia.Base/RelativePoint.cs
+++ b/src/Avalonia.Base/RelativePoint.cs
@@ -199,7 +199,7 @@ namespace Avalonia
         {
             return _unit == RelativeUnit.Absolute ?
                 _point.ToString() :
-                 string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
+                string.Format(CultureInfo.InvariantCulture, "{0}%, {1}%", _point.X * 100, _point.Y * 100);
         }
     }
 }
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
index 06fb526736..2019ad6faa 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/FpsCounter.cs
@@ -52,7 +52,7 @@ internal class FpsCounter
             _lastFpsUpdate = now;
         }
 
-        var fpsLine = $"Frame #{_totalFrames:00000000} FPS: {_fps:000} " + aux;
+        var fpsLine = FormattableString.Invariant($"Frame #{_totalFrames:00000000} FPS: {_fps:000} ") + aux;
         double width = 0;
         double height = 0;
         foreach (var ch in fpsLine)
diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 5c1ac0312c..f5a46506a3 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -156,7 +156,7 @@ namespace Avalonia.Rendering.Composition.Server
                         (Compositor.BatchObjectPool.CurrentUsage + Compositor.BatchObjectPool.CurrentPool) *
                                                                      Compositor.BatchObjectPool.ArraySize *
                                                                      IntPtr.Size), false);
-                    _fpsCounter.RenderFps(targetContext, $"M:{managedMem} / N:{nativeMem} R:{RenderedVisuals:0000}");
+                    _fpsCounter.RenderFps(targetContext, FormattableString.Invariant($"M:{managedMem} / N:{nativeMem} R:{RenderedVisuals:0000}"));
                 }
                 RenderedVisuals = 0;
 
diff --git a/src/Avalonia.Base/Rendering/DeferredRenderer.cs b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
index 971702269c..6de2716528 100644
--- a/src/Avalonia.Base/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
@@ -725,7 +725,7 @@ namespace Avalonia.Rendering
 
             foreach (var layer in Layers)
             {
-                var fileName = Path.Combine(DebugFramesPath ?? string.Empty, $"frame-{id}-layer-{index++}.png");
+                var fileName = Path.Combine(DebugFramesPath ?? string.Empty, FormattableString.Invariant($"frame-{id}-layer-{index++}.png"));
                 layer.Bitmap.Item.Save(fileName);
             }
         }
diff --git a/src/Avalonia.Base/Rendering/RendererBase.cs b/src/Avalonia.Base/Rendering/RendererBase.cs
index 90ba60c42a..f0ddbd3626 100644
--- a/src/Avalonia.Base/Rendering/RendererBase.cs
+++ b/src/Avalonia.Base/Rendering/RendererBase.cs
@@ -36,7 +36,7 @@ namespace Avalonia.Rendering
                 _lastFpsUpdate = now;
             }
 
-            var text = layerCount.HasValue ? $"Layers: {layerCount} FPS: {_fps:000}" : $"FPS: {_fps:000}";
+            var text = layerCount.HasValue ? FormattableString.Invariant($"Layers: {layerCount} FPS: {_fps:000}") : FormattableString.Invariant($"FPS: {_fps:000}");
 
             var formattedText = new FormattedText(text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, Typeface.Default, s_fontSize, Brushes.White);
 
diff --git a/src/Avalonia.Base/Thickness.cs b/src/Avalonia.Base/Thickness.cs
index da3a98088f..c8e6d7dfd2 100644
--- a/src/Avalonia.Base/Thickness.cs
+++ b/src/Avalonia.Base/Thickness.cs
@@ -277,7 +277,7 @@ namespace Avalonia
         /// <returns>The string representation of the thickness.</returns>
         public override string ToString()
         {
-            return $"{_left},{_top},{_right},{_bottom}";
+            return FormattableString.Invariant($"{_left},{_top},{_right},{_bottom}");
         }
 
         /// <summary>
diff --git a/src/Avalonia.Base/VisualTree/TransformedBounds.cs b/src/Avalonia.Base/VisualTree/TransformedBounds.cs
index 42f93d8edb..c6371d3e28 100644
--- a/src/Avalonia.Base/VisualTree/TransformedBounds.cs
+++ b/src/Avalonia.Base/VisualTree/TransformedBounds.cs
@@ -77,6 +77,6 @@ namespace Avalonia.VisualTree
             return !left.Equals(right);
         }
 
-        public override string ToString() => $"Bounds: {Bounds} Clip: {Clip} Transform {Transform}";
+        public override string ToString() => FormattableString.Invariant($"Bounds: {Bounds} Clip: {Clip} Transform {Transform}");
     }
 }
diff --git a/src/Avalonia.Build.Tasks/Extensions.cs b/src/Avalonia.Build.Tasks/Extensions.cs
index 9bedacaf52..b0b7e0cc3d 100644
--- a/src/Avalonia.Build.Tasks/Extensions.cs
+++ b/src/Avalonia.Build.Tasks/Extensions.cs
@@ -5,7 +5,7 @@ namespace Avalonia.Build.Tasks
 {
     static class Extensions
     {
-        static string FormatErrorCode(BuildEngineErrorCode code) => $"AVLN:{(int)code:0000}";
+        static string FormatErrorCode(BuildEngineErrorCode code) => FormattableString.Invariant($"AVLN:{(int)code:0000}");
 
         public static void LogError(this IBuildEngine engine, BuildEngineErrorCode code, string file, Exception ex,
             int lineNumber = 0, int linePosition = 0)
diff --git a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
index 38450ea2a2..fad6ad397b 100644
--- a/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
+++ b/src/Avalonia.Build.Tasks/GenerateAvaloniaResourcesTask.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Build.Tasks
            {
               
                var src = new Source(r.ItemSpec, Root);
-               BuildEngine.LogMessage($"avares -> name:{src.Path}, path: {src.SystemPath}, size:{src.Size}, ItemSpec:{r.ItemSpec}", _reportImportance);
+               BuildEngine.LogMessage(FormattableString.Invariant($"avares -> name:{src.Path}, path: {src.SystemPath}, size:{src.Size}, ItemSpec:{r.ItemSpec}"), _reportImportance);
                return src;
            }).ToList();
 
diff --git a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
index aa587bce72..9774b603e8 100644
--- a/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
+++ b/src/Avalonia.Controls/DateTimePickers/DateTimePickerPanel.cs
@@ -259,7 +259,7 @@ namespace Avalonia.Controls.Primitives
                 SelectedValue = (int)newSel * Increment + MinimumValue;
                 _suppressUpdateOffset = false;
 
-                System.Diagnostics.Debug.WriteLine($"Offset: {_offset} ItemHeight: {ItemHeight}");
+                System.Diagnostics.Debug.WriteLine(FormattableString.Invariant($"Offset: {_offset} ItemHeight: {ItemHeight}"));
             }
         }
 
diff --git a/src/Avalonia.Controls/Selection/IndexRange.cs b/src/Avalonia.Controls/Selection/IndexRange.cs
index dd3445fb70..3b7830002b 100644
--- a/src/Avalonia.Controls/Selection/IndexRange.cs
+++ b/src/Avalonia.Controls/Selection/IndexRange.cs
@@ -86,7 +86,7 @@ namespace Avalonia.Controls.Selection
             return hashCode;
         }
 
-        public override string ToString() => $"[{Begin}..{End}]";
+        public override string ToString() => FormattableString.Invariant($"[{Begin}..{End}]");
 
         public static bool operator ==(IndexRange left, IndexRange right) => left.Equals(right);
         public static bool operator !=(IndexRange left, IndexRange right) => !(left == right);
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
index f100be5d5b..143980dfa5 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs
@@ -162,7 +162,7 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
                     if (sendNow != null && socket != null)
                     {
                         await socket.SendMessage(
-                            $"frame:{sendNow.SequenceId}:{sendNow.Width}:{sendNow.Height}:{sendNow.Stride}:{sendNow.DpiX}:{sendNow.DpiY}");
+                            FormattableString.Invariant($"frame:{sendNow.SequenceId}:{sendNow.Width}:{sendNow.Height}:{sendNow.Stride}:{sendNow.DpiX}:{sendNow.DpiY}"));
                         await socket.SendMessage(false, sendNow.Data);
                     }
 
diff --git a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
index 6bfae536c9..2d02262aa7 100644
--- a/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
+++ b/src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
@@ -146,7 +146,7 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
 
         public async Task RespondAsync(int code, byte[] data, string contentType)
         {
-            var headers = Encoding.UTF8.GetBytes($"HTTP/1.1 {code} {(HttpStatusCode)code}\r\nConnection: close\r\nContent-Type: {contentType}\r\nContent-Length: {data.Length}\r\n\r\n");
+            var headers = Encoding.UTF8.GetBytes(FormattableString.Invariant($"HTTP/1.1 {code} {(HttpStatusCode)code}\r\nConnection: close\r\nContent-Type: {contentType}\r\nContent-Length: {data.Length}\r\n\r\n"));
             await _stream.WriteAsync(headers, 0, headers.Length);
             await _stream.WriteAsync(data, 0, data.Length);
             _stream.Dispose();
diff --git a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
index 4a55212de3..e37067d05c 100644
--- a/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
+++ b/src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs
@@ -127,7 +127,7 @@ namespace Avalonia.FreeDesktop
             var pid = Process.GetCurrentProcess().Id;
             var tid = s_trayIconInstanceId++;
 
-            _sysTrayServiceName = $"org.kde.StatusNotifierItem-{pid}-{tid}";
+            _sysTrayServiceName = FormattableString.Invariant($"org.kde.StatusNotifierItem-{pid}-{tid}");
             _statusNotifierItemDbusObj = new StatusNotifierItemDbusObj(_dbusMenuPath);
 
             try
diff --git a/src/Browser/Avalonia.Browser/Cursor.cs b/src/Browser/Avalonia.Browser/Cursor.cs
index ec0dcc51b4..7d77f6e0d2 100644
--- a/src/Browser/Avalonia.Browser/Cursor.cs
+++ b/src/Browser/Avalonia.Browser/Cursor.cs
@@ -20,9 +20,9 @@ namespace Avalonia.Browser
         /// </summary>
         public CssCursor(string base64, string format, PixelPoint hotspot, StandardCursorType fallback)
         {
-            Value = $"url(\"data:image/{format};base64,{base64}\") {hotspot.X} {hotspot.Y}, {ToKeyword(fallback)}";
+            Value = FormattableString.Invariant($"url(\"data:image/{format};base64,{base64}\") {hotspot.X} {hotspot.Y}, {ToKeyword(fallback)}");
         }
-        
+
         /// <summary>
         /// Create a cursor from url to *.cur file.
         /// </summary>
@@ -30,15 +30,15 @@ namespace Avalonia.Browser
         {
             Value = $"url('{url}'), {ToKeyword(fallback)}";
         }
-        
+
         /// <summary>
         /// Create a cursor from png/svg and hotspot position
         /// </summary>
         public CssCursor(string url, PixelPoint hotSpot, StandardCursorType fallback)
         {
-            Value = $"url('{url}') {hotSpot.X} {hotSpot.Y}, {ToKeyword(fallback)}";
+            Value = FormattableString.Invariant($"url('{url}') {hotSpot.X} {hotSpot.Y}, {ToKeyword(fallback)}");
         }
-        
+
         private static string ToKeyword(StandardCursorType type) => type switch
         {
             StandardCursorType.Hand => "pointer",
@@ -49,16 +49,16 @@ namespace Avalonia.Browser
             StandardCursorType.None => "none",
             StandardCursorType.Wait => "progress",
             StandardCursorType.AppStarting => "wait",
-            
+
             StandardCursorType.DragMove => "move",
             StandardCursorType.DragCopy => "copy",
             StandardCursorType.DragLink => "alias",
-            
+
             StandardCursorType.UpArrow => "default",/*not found matching one*/
             StandardCursorType.SizeWestEast => "ew-resize",
             StandardCursorType.SizeNorthSouth => "ns-resize",
             StandardCursorType.SizeAll => "move",
-            
+
             StandardCursorType.TopSide => "n-resize",
             StandardCursorType.BottomSide => "s-resize",
             StandardCursorType.LeftSide => "w-resize",
@@ -67,10 +67,10 @@ namespace Avalonia.Browser
             StandardCursorType.TopRightCorner => "ne-resize",
             StandardCursorType.BottomLeftCorner => "sw-resize",
             StandardCursorType.BottomRightCorner => "se-resize",
-            
+
             _ => Default,
         };
-        
+
         public void Dispose() {}
     }
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
index a49a7a36d4..f2eb27e3e8 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/CompiledBindingPath.cs
@@ -275,7 +275,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         public int Level { get; }
 
         public override string ToString()
-           => $"$parent[{AncestorType?.Name},{Level}]";
+           => FormattableString.Invariant($"$parent[{AncestorType?.Name},{Level}]");
     }
 
     internal class VisualAncestorPathElement : ICompiledBindingPathElement, IControlSourceBindingPathElement
@@ -316,7 +316,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
         public int[] Indices { get; }
         public Type ElementType { get; }
         public override string ToString()
-            => $"[{string.Join(",", Indices)}]";
+            => FormattableString.Invariant($"[{string.Join(",", Indices)}]");
     }
 
     internal class TypeCastPathElement<T> : ITypeCastElement
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs
index 8ae6d52b12..45e23db84f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/CompiledBindings/FindVisualAncestorNode.cs
@@ -22,11 +22,11 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions.CompiledBindings
             {
                 if (_ancestorType == null)
                 {
-                    return $"$visualparent[{_level}]";
+                    return FormattableString.Invariant($"$visualparent[{_level}]");
                 }
                 else
                 {
-                    return $"$visualparent[{_ancestorType.Name}, {_level}]";
+                    return FormattableString.Invariant($"$visualparent[{_ancestorType.Name}, {_level}]");
                 }
             }
         }

From b23756e48fc8a7ed3f67ac046c3789e4ae7235f5 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 2 Dec 2022 10:09:25 +0100
Subject: [PATCH 08/10] feat: Enable Rules from 1826 to 1829

---
 .editorconfig                                        | 8 ++++++++
 src/Avalonia.Controls/Selection/SelectionNodeBase.cs | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 9ae52b8bbd..b39bbc2f71 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -145,6 +145,14 @@ dotnet_diagnostic.CA1820.severity = warning
 dotnet_diagnostic.CA1821.severity = warning
 # CA1825: Avoid zero-length array allocations
 dotnet_diagnostic.CA1825.severity = warning
+# CA1826: Use property instead of Linq Enumerable method
+dotnet_diagnostic.CA1826.severity = suggestion
+# CA1827: Do not use Count/LongCount when Any can be used
+dotnet_diagnostic.CA1827.severity = warning
+# CA1828: Do not use CountAsync/LongCountAsync when AnyAsync can be used
+dotnet_diagnostic.CA1828.severity = warning
+# CA1829: Use Length/Count property instead of Enumerable.Count method
+dotnet_diagnostic.CA1829.severity = warning
 #CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.CA1847.severity = warning
 
diff --git a/src/Avalonia.Controls/Selection/SelectionNodeBase.cs b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs
index 5994025d56..33a5525acc 100644
--- a/src/Avalonia.Controls/Selection/SelectionNodeBase.cs
+++ b/src/Avalonia.Controls/Selection/SelectionNodeBase.cs
@@ -290,12 +290,12 @@ namespace Avalonia.Controls.Selection
             // so bail.
             //
             // See unit test Handles_Selection_Made_In_CollectionChanged for more details.
-            if (ItemsView is object &&
+            if (ItemsView is not null &&
                 RangesEnabled &&
                 Ranges.Count > 0 &&
                 e.Action == NotifyCollectionChangedAction.Add)
             {
-                var lastIndex = Ranges.Last().End;
+                var lastIndex = Ranges[Ranges.Count - 1].End;
 
                 if (e.NewStartingIndex <= lastIndex)
                 {

From 90ac746515e0206d8d10a651275a06ef24a59b7b Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 2 Dec 2022 15:13:43 +0100
Subject: [PATCH 09/10] feat: Avoid to running Avalonia Build Task. Closed
 #9539

Avoid running the Avalonia Build Task when there aren't Avalonia resources.
---
 packages/Avalonia/AvaloniaBuildTasks.targets | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
index 1b822c14cf..ca2d4b66ed 100644
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -30,7 +30,9 @@
              />
 
 
-  <Target Name="AddAvaloniaResources" BeforeTargets="ResolveReferences">
+  <Target Name="AddAvaloniaResources" 
+          BeforeTargets="ResolveReferences"
+          Condition="('@(AvaloniaResource->Count())' &gt; 0) or ('@(AvaloniaXaml->Count())' &gt; 0)">
     <PropertyGroup>
       <AvaloniaResourcesTemporaryFilePath Condition="'$(AvaloniaResourcesTemporaryFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/resources</AvaloniaResourcesTemporaryFilePath>
     </PropertyGroup>
@@ -62,7 +64,9 @@
           BeforeTargets="CoreCompile;CoreResGen"
           Inputs="@(AvaloniaResource);@(AvaloniaXaml);@(CustomAdditionalGenerateAvaloniaResourcesInputs);$(MSBuildAllProjects)"
           Outputs="$(AvaloniaResourcesTemporaryFilePath)"
-	  DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
+          DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)"
+          Condition="('@(AvaloniaResource->Count())' &gt; 0) or ('@(AvaloniaXaml->Count())' &gt; 0)"
+          >
     <ItemGroup>
         <AvaloniaResource Include="@(AvaloniaXaml)"/>
     </ItemGroup>
@@ -81,7 +85,12 @@
   <Target
     Name="CompileAvaloniaXaml"
     AfterTargets="AfterCompile"
-    Condition="Exists('@(IntermediateAssembly)') And $(DesignTimeBuild) != true And $(EnableAvaloniaXamlCompilation) != false"
+    Condition="
+      (('@(AvaloniaResource->Count())' &gt; 0) 
+          or ('@(AvaloniaXaml->Count())' &gt; 0))
+      and Exists('@(IntermediateAssembly)') 
+      And $(DesignTimeBuild) != true 
+      And $(EnableAvaloniaXamlCompilation) != false"
     >
     <PropertyGroup>
       <AvaloniaXamlReferencesTemporaryFilePath Condition="'$(AvaloniaXamlReferencesTemporaryFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/references</AvaloniaXamlReferencesTemporaryFilePath>

From 00600f936f996c3e545ac32f6b12ca2dfd4a7796 Mon Sep 17 00:00:00 2001
From: Kevin Ivarsen <kivarsen@planewave.com>
Date: Fri, 2 Dec 2022 13:00:15 -0800
Subject: [PATCH 10/10] Fix crash when launching ControlCatalog.Desktop (see
 #9599)

---
 src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
index f059c18257..d606b00109 100644
--- a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
@@ -1245,7 +1245,7 @@ namespace Avalonia.Win32.DxgiSwapchain
 
         internal RECT DesktopCoordinates;
 
-        internal bool AttachedToDesktop;
+        internal int AttachedToDesktop; // BOOL maps to int. If we use the CLR 'bool' type here, the struct becomes non-blittable. See #9599
 
         internal DXGI_MODE_ROTATION Rotation;
 
@@ -1323,7 +1323,7 @@ namespace Avalonia.Win32.DxgiSwapchain
         public uint Width;
         public uint Height;
         public DXGI_FORMAT Format;
-        public bool Stereo;
+        public int Stereo; // BOOL maps to int. If we use the CLR 'bool' type here, the struct becomes non-blittable. See #9599
         public DXGI_SAMPLE_DESC SampleDesc;
         public uint BufferUsage;
         public uint BufferCount;