diff --git a/.editorconfig b/.editorconfig
index 9ae52b8bbd..41eed9f9d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -137,14 +137,27 @@ space_within_single_line_array_initializer_braces = true
 #Net Analyzer
 dotnet_analyzer_diagnostic.category-Performance.severity = none #error - Uncomment when all violations are fixed.
 
+# CA1304: Specify CultureInfo
+dotnet_diagnostic.CA1304.severity = warning
 # CA1802: Use literals where appropriate
 dotnet_diagnostic.CA1802.severity = warning
 # CA1820: Test for empty strings using string length
 dotnet_diagnostic.CA1820.severity = warning
 # CA1821: Remove empty finalizers
 dotnet_diagnostic.CA1821.severity = warning
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = suggestion
+dotnet_code_quality.CA1822.api_surface = private, internal
 # 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/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>
diff --git a/samples/ControlCatalog.NetCore/Program.cs b/samples/ControlCatalog.NetCore/Program.cs
index b1bacc6483..d5e5cb14dc 100644
--- a/samples/ControlCatalog.NetCore/Program.cs
+++ b/samples/ControlCatalog.NetCore/Program.cs
@@ -99,6 +99,15 @@ namespace ControlCatalog.NetCore
                 SilenceConsole();
                 return builder.StartLinuxDrm(args, scaling: GetScaling());
             }
+            else if (args.Contains("--dxgi"))
+            {
+                builder.With(new Win32PlatformOptions()
+                {
+                    UseLowLatencyDxgiSwapChain = true,
+                    UseWindowsUIComposition = false
+                });
+                return builder.StartWithClassicDesktopLifetime(args);
+            }
             else
                 return builder.StartWithClassicDesktopLifetime(args);
         }
diff --git a/samples/ControlCatalog.NetCore/Properties/launchSettings.json b/samples/ControlCatalog.NetCore/Properties/launchSettings.json
new file mode 100644
index 0000000000..5964ca320e
--- /dev/null
+++ b/samples/ControlCatalog.NetCore/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "ControlCatalog.NetCore": {
+      "commandName": "Project"
+    },
+    "Dxgi": {
+      "commandName": "Project",
+      "commandLineArgs": "--dxgi"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index 6b550a30be..18f0dd16ba 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -33,4 +33,14 @@
   </ItemGroup>
 
   <Import Project="..\..\build\BuildTargets.targets" />
+
+  <ItemGroup>
+    <None Remove="Pages\CustomDrawing.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AvaloniaResource Update="Pages\CustomDrawing.xaml">
+      <Generator></Generator>
+    </AvaloniaResource>
+  </ItemGroup>
 </Project>
diff --git a/samples/ControlCatalog/Converter/DegToRadConverter.cs b/samples/ControlCatalog/Converter/DegToRadConverter.cs
new file mode 100644
index 0000000000..b062bcb64a
--- /dev/null
+++ b/samples/ControlCatalog/Converter/DegToRadConverter.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using Avalonia.Data.Converters;
+
+namespace ControlCatalog.Converter
+{
+    public class DegToRadConverter : IValueConverter
+    {
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is double rad)
+            {
+                return rad * 180.0d / Math.PI;
+            }
+            return 0.0d;
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is double deg)
+            {
+                return deg / 180.0d * Math.PI;
+            }
+            return 0.0d;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index b5a09b5fbd..b95b455ca4 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -66,6 +66,9 @@
       <TabItem Header="Cursor" ScrollViewer.VerticalScrollBarVisibility="Disabled">
         <pages:CursorPage />
       </TabItem>
+      <TabItem Header="Custom Drawing" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <pages:CustomDrawing/>
+      </TabItem>
       <TabItem Header="DataGrid"
                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                ScrollViewer.VerticalScrollBarVisibility="Disabled">
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 8d9cd74ea7..ae7e43f511 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -14,7 +14,26 @@ namespace ControlCatalog.Pages
 {
     public class AutoCompleteBoxPage : UserControl
     {
-        private StateData[] BuildAllStates()
+        public class StateData
+        {
+            public string Name { get; private set; }
+            public string Abbreviation { get; private set; }
+            public string Capital { get; private set; }
+
+            public StateData(string name, string abbreviatoin, string capital)
+            {
+                Name = name;
+                Abbreviation = abbreviatoin;
+                Capital = capital;
+            }
+
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+
+        private static StateData[] BuildAllStates()
         {
             return new StateData[]
             {
@@ -72,7 +91,7 @@ namespace ControlCatalog.Pages
         }
         public StateData[] States { get; private set; }
         
-        private LinkedList<string>[] BuildAllSentences()
+        private static LinkedList<string>[] BuildAllSentences()
         {
             return new string[]
             {
@@ -124,7 +143,7 @@ namespace ControlCatalog.Pages
                     .OfType<AutoCompleteBox>();
         }
 
-        private bool StringContains(string str, string? query)
+        private static bool StringContains(string str, string? query)
         {
             if (query == null) return false;
             return str.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0;
diff --git a/samples/ControlCatalog/Pages/CompositionPage.axaml.cs b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
index 61e0ed5acb..c70675b606 100644
--- a/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
+++ b/samples/ControlCatalog/Pages/CompositionPage.axaml.cs
@@ -25,7 +25,7 @@ public partial class CompositionPage : UserControl
         this.Get<ItemsControl>("Items").Items = CreateColorItems();
     }
 
-    private List<CompositionPageColorItem> CreateColorItems()
+    private static List<CompositionPageColorItem> CreateColorItems()
     {
         var list = new List<CompositionPageColorItem>();
 
diff --git a/samples/ControlCatalog/Pages/CustomDrawing.xaml b/samples/ControlCatalog/Pages/CustomDrawing.xaml
new file mode 100644
index 0000000000..04b7fcfea5
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CustomDrawing.xaml
@@ -0,0 +1,107 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:local="using:ControlCatalog.Pages"
+             xmlns:converters="using:ControlCatalog.Converter"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="ControlCatalog.Pages.CustomDrawing">
+
+  <UserControl.Resources>
+    <converters:DegToRadConverter x:Key="DegToRadConverter"/>
+  </UserControl.Resources>
+  
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition/>
+      <ColumnDefinition/>
+      <ColumnDefinition/>
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition/>
+    </Grid.RowDefinitions>
+
+    <StackPanel Orientation="Vertical">
+      <TextBlock Text="Translation" HorizontalAlignment="Center"/>
+      <Grid ColumnDefinitions="*,*"
+            RowDefinitions="Auto,Auto"
+            >
+        <TextBlock Text="Horizontal"/>
+        <TextBlock Text="Vertical" Grid.Column="1"/>
+        <TextBox IsEnabled="False" 
+                 Text="{Binding ElementName=CustomDrawingControl,
+                  Path=ViewportCenterX,
+                  Mode=OneWay,
+                  StringFormat=\{0:g4\}}"
+                 Grid.Row="1"
+                 />
+        <TextBox IsEnabled="False"
+                 Text="{Binding ElementName=CustomDrawingControl,
+                  Path=ViewportCenterY, 
+                  Mode=OneWay,
+                  StringFormat=\{0:g4\}}"
+                 Grid.Row="1" Grid.Column="1"
+                 />
+      </Grid>
+    </StackPanel>
+
+    <StackPanel Orientation="Vertical" Grid.Column="1"
+                >
+      <TextBlock Text="Rotation" HorizontalAlignment="Center"/>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
+                  >
+        <Button Content="➖" Width="40" Height="40"
+                VerticalContentAlignment="Center"
+                VerticalAlignment="Center"
+                Click="RotateMinus"
+                />
+        <TextBox IsEnabled="False"
+                 Text="{Binding ElementName=CustomDrawingControl,
+                  Path=Rotation, 
+                  Converter={StaticResource DegToRadConverter},
+                  Mode=OneWay,
+                  StringFormat=\{0:g4\}}"
+                 Grid.Row="1" Grid.Column="1"
+                 />
+        <Button Content="➕" Width="40" Height="40"
+                VerticalContentAlignment="Center"
+                VerticalAlignment="Center"
+                Click="RotatePlus"
+                />
+      </StackPanel>
+    </StackPanel>
+
+    <StackPanel Orientation="Vertical" Grid.Column="2"
+                >
+      <TextBlock Text="Scale" HorizontalAlignment="Center"/>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
+                  >
+        <Button Content="➖" Width="40" Height="40"
+                VerticalContentAlignment="Center"
+                VerticalAlignment="Center"
+                Click="ZoomOut"
+                />
+        <TextBox IsEnabled="False"
+                 Text="{Binding ElementName=CustomDrawingControl,
+                  Path=Scale, 
+                  Mode=OneWay,
+                  StringFormat=\{0:g4\}}"
+                 Grid.Row="1" Grid.Column="1"
+                 />
+        <Button Content="➕" Width="40" Height="40"
+                VerticalContentAlignment="Center"
+                VerticalAlignment="Center"
+                Click="ZoomIn"
+                />
+      </StackPanel>
+    </StackPanel>
+    
+    <Grid Grid.Row="1" Grid.ColumnSpan="3" ClipToBounds="True">
+      <local:CustomDrawingExampleControl
+        x:Name="CustomDrawingControl"
+        />
+    </Grid>
+  </Grid>
+  
+</UserControl>
diff --git a/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs b/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs
new file mode 100644
index 0000000000..0416e587b9
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CustomDrawing.xaml.cs
@@ -0,0 +1,67 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+
+namespace ControlCatalog.Pages
+{
+    public partial class CustomDrawing : UserControl
+    {
+        public CustomDrawing()
+        {
+            InitializeComponent();
+        }
+
+        private CustomDrawingExampleControl? _customControl;
+        public CustomDrawingExampleControl CustomDrawingControl
+        {
+            get
+            {
+                if (_customControl is not null)
+                    return _customControl;
+                throw new System.Exception("Control did not get initialized");
+            }
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+            var cntrl = this.FindControl<CustomDrawingExampleControl>("CustomDrawingControl");
+            if (cntrl != null)
+            {
+                _customControl = cntrl;
+            }
+            else
+            {
+                // be sad about it 
+            }
+        }
+
+        private void RotateMinus (object? sender, RoutedEventArgs e)
+        {
+            if (_customControl is null) return;
+            _customControl.Rotation -= Math.PI / 20.0d;
+        }
+
+        private void RotatePlus(object? sender, RoutedEventArgs e)
+        {
+            if (_customControl is null)
+                return;
+            _customControl.Rotation += Math.PI / 20.0d;
+        }
+
+        private void ZoomIn(object? sender, RoutedEventArgs e)
+        {
+            if (_customControl is null)
+                return;
+            _customControl.Scale *= 1.2d;
+        }
+
+        private void ZoomOut(object? sender, RoutedEventArgs e)
+        {
+            if (_customControl is null)
+                return;
+            _customControl.Scale /= 1.2d;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/CustomDrawingExampleControl.cs b/samples/ControlCatalog/Pages/CustomDrawingExampleControl.cs
new file mode 100644
index 0000000000..11e5e32cf1
--- /dev/null
+++ b/samples/ControlCatalog/Pages/CustomDrawingExampleControl.cs
@@ -0,0 +1,215 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Input;
+using Avalonia.Threading;
+using Avalonia.Controls.Shapes;
+
+namespace ControlCatalog.Pages
+{
+    public class CustomDrawingExampleControl : Control
+    {
+        private Point _cursorPoint;
+
+
+        public StyledProperty<double> ScaleProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Scale), 1.0d);
+        public double Scale { get => GetValue(ScaleProperty); set => SetValue(ScaleProperty, value); }
+
+        public StyledProperty<double> RotationProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(Rotation));
+        /// <summary>
+        /// Rotation, measured in Radians!
+        /// </summary>
+        public double Rotation
+        {
+            get => GetValue(RotationProperty);
+            set
+            {
+                double valueToUse = value % (Math.PI * 2);
+                SetValue(RotationProperty, valueToUse);
+            }
+        }
+
+        public StyledProperty<double> ViewportCenterYProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterY), 0.0d);
+        public double ViewportCenterY { get => GetValue(ViewportCenterYProperty); set => SetValue(ViewportCenterYProperty, value); }
+
+        public StyledProperty<double> ViewportCenterXProperty = AvaloniaProperty.Register<CustomDrawingExampleControl, double>(nameof(ViewportCenterX), 0.0d);
+        public double ViewportCenterX { get => GetValue(ViewportCenterXProperty); set => SetValue(ViewportCenterXProperty, value); }
+
+        private IPen _pen;
+
+        private System.Diagnostics.Stopwatch _timeKeeper = System.Diagnostics.Stopwatch.StartNew();
+
+        private bool _isPointerCaptured = false;
+
+        public CustomDrawingExampleControl()
+        {
+            _pen = new Pen(new SolidColorBrush(Colors.Black), lineCap: PenLineCap.Round);
+
+            var _arc = new ArcSegment()
+            {
+                IsLargeArc = false,
+                Point = new Point(0, 0),
+                RotationAngle = 0,
+                Size = new Size(25, 25),
+                SweepDirection = SweepDirection.Clockwise,
+
+            };
+            StreamGeometry sg = new StreamGeometry();
+            var cntx = sg.Open();
+            cntx.BeginFigure(new Point(-25.0d, -10.0d), false);
+            cntx.ArcTo(new Point(25.0d, -10.0d), new Size(10.0d, 10.0d), 0.0d, false, SweepDirection.Clockwise);
+            cntx.EndFigure(true);
+            _smileGeometry = sg.Clone();
+        }
+
+        private Geometry _smileGeometry;
+
+        protected override void OnPointerMoved(PointerEventArgs e)
+        {
+            base.OnPointerMoved(e);
+
+            Point previousPoint = _cursorPoint;
+
+            _cursorPoint = e.GetPosition(this);
+
+            if (_isPointerCaptured)
+            {
+                Point oldWorldPoint = UIPointToWorldPoint(previousPoint, ViewportCenterX, ViewportCenterY, Scale, Rotation);
+                Point newWorldPoint = UIPointToWorldPoint(_cursorPoint, ViewportCenterX, ViewportCenterY, Scale, Rotation);
+
+                Vector diff = newWorldPoint - oldWorldPoint;
+
+                ViewportCenterX -= diff.X;
+                ViewportCenterY -= diff.Y;
+            }
+        }
+
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            e.Handled = true;
+            e.Pointer.Capture(this);
+            _isPointerCaptured = true;
+            base.OnPointerPressed(e);
+        }
+
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+            var oldScale = Scale;
+            Scale *= (1.0d + e.Delta.Y / 12.0d);
+
+            Point oldWorldPoint = UIPointToWorldPoint(_cursorPoint, ViewportCenterX, ViewportCenterY, oldScale, Rotation);
+            Point newWorldPoint = UIPointToWorldPoint(_cursorPoint, ViewportCenterX, ViewportCenterY, Scale, Rotation);
+
+            Vector diff = newWorldPoint - oldWorldPoint;
+
+            ViewportCenterX -= diff.X;
+            ViewportCenterY -= diff.Y;
+        }
+
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            e.Pointer.Capture(null);
+            _isPointerCaptured = false;
+            base.OnPointerReleased(e);
+        }
+
+        public override void Render(DrawingContext context)
+        {
+            var localBounds = new Rect(new Size(this.Bounds.Width, this.Bounds.Height));
+            var clip = context.PushClip(this.Bounds);
+            context.DrawRectangle(Brushes.White, _pen, localBounds, 1.0d);
+
+            var halfMax = Math.Max(this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d) * Math.Sqrt(2.0d);
+            var halfMin = Math.Min(this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d) / 1.3d;
+            var halfWidth = this.Bounds.Width / 2.0d;
+            var halfHeight = this.Bounds.Height / 2.0d;
+
+            // 0,0 refers to the top-left of the control now. It is not prime time to draw gui stuff because it'll be under the world 
+
+            var translateModifier = context.PushPreTransform(Avalonia.Matrix.CreateTranslation(new Avalonia.Vector(halfWidth, halfHeight)));
+
+            // now 0,0 refers to the ViewportCenter(X,Y). 
+            var rotationMatrix = Avalonia.Matrix.CreateRotation(Rotation);
+            var rotationModifier = context.PushPreTransform(rotationMatrix);
+
+            // everything is rotated but not scaled 
+
+            var scaleModifier = context.PushPreTransform(Avalonia.Matrix.CreateScale(Scale, -Scale));
+
+            var mapPositionModifier = context.PushPreTransform(Matrix.CreateTranslation(new Vector(-ViewportCenterX, -ViewportCenterY)));
+
+            // now everything is rotated and scaled, and at the right position, now we're drawing strictly in world coordinates
+
+            context.DrawEllipse(Brushes.White, _pen, new Point(0.0d, 0.0d), 50.0d, 50.0d);
+            context.DrawLine(_pen, new Point(-25.0d, -5.0d), new Point(-25.0d, 15.0d));
+            context.DrawLine(_pen, new Point(25.0d, -5.0d), new Point(25.0d, 15.0d));
+            context.DrawGeometry(null, _pen, _smileGeometry);
+
+            Point cursorInWorldPoint = UIPointToWorldPoint(_cursorPoint, ViewportCenterX, ViewportCenterY, Scale, Rotation);
+            context.DrawEllipse(Brushes.Gray, _pen, cursorInWorldPoint, 20.0d, 20.0d);
+            
+
+            for (int i = 0; i < 10; i++)
+            {
+                double orbitRadius = i * 100 + 200;
+                var orbitInput = ((_timeKeeper.Elapsed.TotalMilliseconds + 987654d) / orbitRadius) / 10.0d;
+                if (i % 3 == 0)
+                    orbitInput *= -1;
+                Point orbitPosition = new Point(Math.Sin(orbitInput) * orbitRadius, Math.Cos(orbitInput) * orbitRadius);
+                context.DrawEllipse(Brushes.Gray, _pen, orbitPosition, 20.0d, 20.0d);
+            }
+
+
+            // end drawing the world 
+
+            mapPositionModifier.Dispose();
+
+            scaleModifier.Dispose();
+
+            rotationModifier.Dispose();
+            translateModifier.Dispose();
+
+            // this is prime time to draw gui stuff 
+
+            context.DrawLine(_pen, _cursorPoint + new Vector(-20, 0), _cursorPoint + new Vector(20, 0));
+            context.DrawLine(_pen, _cursorPoint + new Vector(0, -20), _cursorPoint + new Vector(0, 20));
+
+            clip.Dispose();
+
+            // oh and draw again when you can, no rush, right? 
+            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+        }
+
+        private Point UIPointToWorldPoint(Point inPoint, double viewportCenterX, double viewportCenterY, double scale, double rotation)
+        {
+            Point workingPoint = new Point(inPoint.X, -inPoint.Y);
+            workingPoint += new Vector(-this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d);
+            workingPoint /= scale;
+
+            workingPoint = Matrix.CreateRotation(rotation).Transform(workingPoint);
+
+            workingPoint += new Vector(viewportCenterX, viewportCenterY);
+
+            return workingPoint;
+        }
+
+        private Point WorldPointToUIPoint(Point inPoint, double viewportCenterX, double viewportCenterY, double scale, double rotation)
+        {
+            Point workingPoint = new Point(inPoint.X, inPoint.Y);
+
+            workingPoint -= new Vector(viewportCenterX, viewportCenterY);
+            // undo rotation
+            workingPoint = Matrix.CreateRotation(-rotation).Transform(workingPoint);
+            workingPoint *= scale;
+            workingPoint -= new Vector(-this.Bounds.Width / 2.0d, this.Bounds.Height / 2.0d);
+            workingPoint = new Point(workingPoint.X, -workingPoint.Y);
+
+            return workingPoint;
+        }
+    }
+}
diff --git a/samples/ControlCatalog/Pages/ImagePage.xaml.cs b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
index 45043aa5af..511b01c7ac 100644
--- a/samples/ControlCatalog/Pages/ImagePage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ImagePage.xaml.cs
@@ -58,7 +58,7 @@ namespace ControlCatalog.Pages
             }
         }
 
-        private PixelRect GetCropRect(int index)
+        private static PixelRect GetCropRect(int index)
         {
             var bitmapWidth = 640;
             var bitmapHeight = 426;
diff --git a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
index a126fbefe5..ded02330d5 100644
--- a/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/OpenGlPage.xaml.cs
@@ -247,7 +247,7 @@ namespace ControlCatalog.Pages
 
         }
 
-        private void CheckError(GlInterface gl)
+        private static void CheckError(GlInterface gl)
         {
             int err;
             while ((err = gl.GetError()) != GL_NO_ERROR)
diff --git a/samples/ControlCatalog/Pages/ScreenPage.cs b/samples/ControlCatalog/Pages/ScreenPage.cs
index ff62b834c4..6af4cf353e 100644
--- a/samples/ControlCatalog/Pages/ScreenPage.cs
+++ b/samples/ControlCatalog/Pages/ScreenPage.cs
@@ -66,6 +66,7 @@ namespace ControlCatalog.Pages
                     context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 40));
 
                     formattedText = CreateFormattedText($"IsPrimary: {screen.IsPrimary}");
+
                     context.DrawText(formattedText, boundsRect.Position.WithY(boundsRect.Size.Height + 60));
 
                     formattedText =
@@ -77,7 +78,7 @@ namespace ControlCatalog.Pages
             context.DrawRectangle(p, new Rect(w.Position.X / 10f + Math.Abs(_leftMost), w.Position.Y / 10f, w.Bounds.Width / 10, w.Bounds.Height / 10));
         }
 
-        private FormattedText CreateFormattedText(string textToFormat)
+        private static FormattedText CreateFormattedText(string textToFormat)
         {
             return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
                 Typeface.Default, 12, Brushes.Green);
diff --git a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
index 74e9928b24..413b6e1c75 100644
--- a/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/TabControlPage.xaml.cs
@@ -49,7 +49,7 @@ namespace ControlCatalog.Pages
             AvaloniaXamlLoader.Load(this);
         }
 
-        private IBitmap LoadBitmap(string uri)
+        private static IBitmap LoadBitmap(string uri)
         {
             var assets = AvaloniaLocator.Current!.GetService<IAssetLoader>()!;
             return new Bitmap(assets.Open(new Uri(uri)));
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>
diff --git a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
index 57f6469a42..bc24a16e56 100644
--- a/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
+++ b/src/Android/Avalonia.Android/Platform/Specific/Helpers/AndroidKeyboardEventsHelper.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Android.Platform.Specific.Helpers
             return DispatchKeyEventInternal(e, out callBase);
         }
 
-        string UnicodeTextInput(KeyEvent keyEvent)
+        static string UnicodeTextInput(KeyEvent keyEvent)
         {
             return keyEvent.Action == KeyEventActions.Multiple
                 && keyEvent.RepeatCount == 0
diff --git a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
index a9b2e16d43..078f70db60 100644
--- a/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
+++ b/src/Android/Avalonia.Android/Platform/Storage/AndroidStorageItem.cs
@@ -178,7 +178,7 @@ internal sealed class AndroidStorageFile : AndroidStorageItem, IStorageBookmarkF
         return false;
     }
 
-    private Stream? GetVirtualFileStream(Context context, AndroidUri uri, bool isOutput)
+    private static Stream? GetVirtualFileStream(Context context, AndroidUri uri, bool isOutput)
     {
         var mimeTypes = context.ContentResolver?.GetStreamTypes(uri, FilePickerFileTypes.All.MimeTypes![0]);
         if (mimeTypes?.Length >= 1)
diff --git a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
index 4727ea1bfb..068c190fa1 100644
--- a/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
+++ b/src/Avalonia.Base/Animation/Animators/GradientBrushAnimator.cs
@@ -72,7 +72,7 @@ namespace Avalonia.Animation.Animators
             return control.Bind((AvaloniaProperty<IBrush?>)Property, instance, BindingPriority.Animation);
         }
 
-        private IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
+        private static IReadOnlyList<ImmutableGradientStop> InterpolateStops(double progress, IReadOnlyList<IGradientStop> oldValue, IReadOnlyList<IGradientStop> newValue)
         {
             var resultCount = Math.Max(oldValue.Count, newValue.Count);
             var stops = new ImmutableGradientStop[resultCount];
diff --git a/src/Avalonia.Base/Animation/KeySpline.cs b/src/Avalonia.Base/Animation/KeySpline.cs
index a6e9769186..6ca5b2e759 100644
--- a/src/Avalonia.Base/Animation/KeySpline.cs
+++ b/src/Avalonia.Base/Animation/KeySpline.cs
@@ -196,7 +196,7 @@ namespace Avalonia.Animation
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        private bool IsValidXValue(double value)
+        private static bool IsValidXValue(double value)
         {
             return value >= 0.0 && value <= 1.0;
         }
diff --git a/src/Avalonia.Base/Controls/Classes.cs b/src/Avalonia.Base/Controls/Classes.cs
index 30c6fdefa3..e41e1cc488 100644
--- a/src/Avalonia.Base/Controls/Classes.cs
+++ b/src/Avalonia.Base/Controls/Classes.cs
@@ -37,7 +37,7 @@ namespace Avalonia.Controls
         /// <param name="items">The initial items.</param>
         public Classes(params string[] items)
             : base(items)
-        {            
+        {
         }
 
         /// <summary>
@@ -320,7 +320,7 @@ namespace Avalonia.Controls
                 listener.Changed();
         }
 
-        private void ThrowIfPseudoclass(string name, string operation)
+        private static void ThrowIfPseudoclass(string name, string operation)
         {
             if (name.StartsWith(":"))
             {
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/Data/Core/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
index 4f755ff140..e4b833176c 100644
--- a/src/Avalonia.Base/Data/Core/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -159,7 +159,7 @@ namespace Avalonia.Data.Core
             _listening = false;
         }
 
-        private BindingNotification TargetNullNotification()
+        private static BindingNotification TargetNullNotification()
         {
             return new BindingNotification(
                 new MarkupBindingChainException("Null value"),
diff --git a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
index 1e82214d76..42aefb3f54 100644
--- a/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ExpressionVisitorNodeBuilder.cs
@@ -81,7 +81,7 @@ namespace Avalonia.Data.Core.Parsers
             return node;
         }
 
-        private T GetArgumentExpressionValue<T>(Expression expr)
+        private static T GetArgumentExpressionValue<T>(Expression expr)
         {
             try
             {
@@ -193,7 +193,7 @@ namespace Avalonia.Data.Core.Parsers
             throw new ExpressionParseException(0, $"Invalid method call in binding expression: '{node.Method.DeclaringType!.AssemblyQualifiedName}.{node.Method.Name}'.");
         }
 
-        private PropertyInfo? TryGetPropertyFromMethod(MethodInfo method)
+        private static PropertyInfo? TryGetPropertyFromMethod(MethodInfo method)
         {
             var type = method.DeclaringType;
             return type?.GetRuntimeProperties().FirstOrDefault(prop => prop.GetMethod == method);
diff --git a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
index 361d68dc81..118b18c020 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Data.Core.Plugins
                 }
             }
 
-            private Exception CreateException(IList<ValidationResult> errors)
+            private static Exception CreateException(IList<ValidationResult> errors)
             {
                 if (errors.Count == 1)
                 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index 1e7a0d5c8f..385d96a7b8 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -108,7 +108,7 @@ namespace Avalonia.Data.Core.Plugins
                 return target;
             }
 
-            private Exception GenerateException(IList<object> errors)
+            private static Exception GenerateException(IList<object> errors)
             {
                 if (errors.Count == 1)
                 {
diff --git a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
index 377ea9f275..6703d1f54e 100644
--- a/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
@@ -59,7 +59,7 @@ namespace Avalonia.Data.Core.Plugins
             return Observable.Empty<object?>();
         }
 
-        private IObservable<object?> HandleCompleted(Task task)
+        private static IObservable<object?> HandleCompleted(Task task)
         {
             var resultProperty = task.GetType().GetRuntimeProperty("Result");
             
diff --git a/src/Avalonia.Base/Input/AccessKeyHandler.cs b/src/Avalonia.Base/Input/AccessKeyHandler.cs
index 5695d27153..59c66ed505 100644
--- a/src/Avalonia.Base/Input/AccessKeyHandler.cs
+++ b/src/Avalonia.Base/Input/AccessKeyHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
@@ -23,7 +24,7 @@ namespace Avalonia.Input
         /// <summary>
         /// The registered access keys.
         /// </summary>
-        private readonly List<Tuple<string, IInputElement>> _registered = new List<Tuple<string, IInputElement>>();
+        private readonly List<(string AccessKey, IInputElement Element)> _registered = new();
 
         /// <summary>
         /// The window to which the handler belongs.
@@ -108,12 +109,12 @@ namespace Avalonia.Input
         {
             var existing = _registered.FirstOrDefault(x => x.Item2 == element);
 
-            if (existing != null)
+            if (existing != default)
             {
                 _registered.Remove(existing);
             }
 
-            _registered.Add(Tuple.Create(accessKey.ToString().ToUpper(), element));
+            _registered.Add((accessKey.ToString().ToUpperInvariant(), element));
         }
 
         /// <summary>
@@ -143,7 +144,7 @@ namespace Avalonia.Input
                 {
                     // TODO: Use FocusScopes to store the current element and restore it when context menu is closed.
                     // Save currently focused input element.
-                    _restoreFocusElement = FocusManager.Instance?.Current;                    
+                    _restoreFocusElement = FocusManager.Instance?.Current;
 
                     // When Alt is pressed without a main menu, or with a closed main menu, show
                     // access key markers in the window (i.e. "_File").
@@ -180,10 +181,11 @@ namespace Avalonia.Input
             {
                 // If any other key is pressed with the Alt key held down, or the main menu is open,
                 // find all controls who have registered that access key.
-                var text = e.Key.ToString().ToUpper();
+                var text = e.Key.ToString();
                 var matches = _registered
-                    .Where(x => x.Item1 == text && ((Visual)x.Item2).IsEffectivelyVisible)
-                    .Select(x => x.Item2);
+                    .Where(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)
+                        && x.Element.IsEffectivelyVisible)
+                    .Select(x => x.Element);
 
                 // If the menu is open, only match controls in the menu's visual tree.
                 if (menuIsOpen)
@@ -194,7 +196,7 @@ namespace Avalonia.Input
                 var match = matches.FirstOrDefault();
 
                 // If there was a match, raise the AccessKeyPressed event on it.
-                if (match != null)
+                if (match is not null)
                 {
                     match.RaiseEvent(new RoutedEventArgs(AccessKeyPressedEvent));
                     e.Handled = true;
diff --git a/src/Avalonia.Base/Input/DragDropDevice.cs b/src/Avalonia.Base/Input/DragDropDevice.cs
index 1e8035831e..04d4693352 100644
--- a/src/Avalonia.Base/Input/DragDropDevice.cs
+++ b/src/Avalonia.Base/Input/DragDropDevice.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Input
         
         private Interactive? _lastTarget = null;
         
-        private Interactive? GetTarget(IInputRoot root, Point local)
+        private static Interactive? GetTarget(IInputRoot root, Point local)
         {
             var hit = root.InputHitTest(local) as Visual;
             var target = hit?.GetSelfAndVisualAncestors()?.OfType<Interactive>()?.FirstOrDefault();
@@ -20,7 +20,7 @@ namespace Avalonia.Input
             return null;
         }
         
-        private DragDropEffects RaiseDragEvent(Interactive? target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, KeyModifiers modifiers)
+        private static DragDropEffects RaiseDragEvent(Interactive? target, IInputRoot inputRoot, Point point, RoutedEvent<DragEventArgs> routedEvent, DragDropEffects operation, IDataObject data, KeyModifiers modifiers)
         {
             if (target == null)
                 return DragDropEffects.None;
diff --git a/src/Avalonia.Base/Input/KeyGesture.cs b/src/Avalonia.Base/Input/KeyGesture.cs
index 1a6372d346..c6618fd550 100644
--- a/src/Avalonia.Base/Input/KeyGesture.cs
+++ b/src/Avalonia.Base/Input/KeyGesture.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 using Avalonia.Utilities;
 
@@ -143,7 +144,7 @@ namespace Avalonia.Input
         // TODO: Move that to external key parser
         private static Key ParseKey(string key)
         {
-            if (s_keySynonyms.TryGetValue(key.ToLower(), out Key rv))
+            if (s_keySynonyms.TryGetValue(key.ToLower(CultureInfo.InvariantCulture), out Key rv))
                 return rv;
 
             return EnumHelper.Parse<Key>(key, true);
@@ -166,7 +167,7 @@ namespace Avalonia.Input
             return EnumHelper.Parse<KeyModifiers>(modifier.ToString(), true);
         }
 
-        private Key ResolveNumPadOperationKey(Key key)
+        private static Key ResolveNumPadOperationKey(Key key)
         {
             switch (key)
             {
diff --git a/src/Avalonia.Base/Input/KeyboardDevice.cs b/src/Avalonia.Base/Input/KeyboardDevice.cs
index 9d23cc49d9..26ff71a4e7 100644
--- a/src/Avalonia.Base/Input/KeyboardDevice.cs
+++ b/src/Avalonia.Base/Input/KeyboardDevice.cs
@@ -25,7 +25,7 @@ namespace Avalonia.Input
 
         public IInputElement? FocusedElement => _focusedElement;
 
-        private void ClearFocusWithinAncestors(IInputElement? element)
+        private static void ClearFocusWithinAncestors(IInputElement? element)
         {
             var el = element;
             
diff --git a/src/Avalonia.Base/Input/MouseDevice.cs b/src/Avalonia.Base/Input/MouseDevice.cs
index 71c1b2f145..9b17e336d3 100644
--- a/src/Avalonia.Base/Input/MouseDevice.cs
+++ b/src/Avalonia.Base/Input/MouseDevice.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Linq;
 using Avalonia.Input.Raw;
-using Avalonia.Interactivity;
 using Avalonia.Platform;
 using Avalonia.Utilities;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Input
 {
@@ -34,7 +30,7 @@ namespace Avalonia.Input
                 ProcessRawEvent(margs);
         }
 
-        int ButtonCount(PointerPointProperties props)
+        static int ButtonCount(PointerPointProperties props)
         {
             var rv = 0;
             if (props.IsLeftButtonPressed)
@@ -106,9 +102,10 @@ namespace Avalonia.Input
 
         private void LeaveWindow()
         {
+
         }
 
-        PointerPointProperties CreateProperties(RawPointerEventArgs args)
+        static PointerPointProperties CreateProperties(RawPointerEventArgs args)
         {
             return new PointerPointProperties(args.InputModifiers, args.Type.ToUpdateKind());
         }
diff --git a/src/Avalonia.Base/Input/PenDevice.cs b/src/Avalonia.Base/Input/PenDevice.cs
index d7d9bf8902..98da83c1ce 100644
--- a/src/Avalonia.Base/Input/PenDevice.cs
+++ b/src/Avalonia.Base/Input/PenDevice.cs
@@ -99,7 +99,7 @@ namespace Avalonia.Input
             return false;
         }
 
-        private bool PenMove(Pointer pointer, ulong timestamp,
+        private static bool PenMove(Pointer pointer, ulong timestamp,
             IInputRoot root, Point p, PointerPointProperties properties,
             KeyModifiers inputModifiers, IInputElement? hitTest,
             Lazy<IReadOnlyList<RawPointerPoint>?>? intermediatePoints)
diff --git a/src/Avalonia.Base/Input/Pointer.cs b/src/Avalonia.Base/Input/Pointer.cs
index 25adc359a2..4713364f00 100644
--- a/src/Avalonia.Base/Input/Pointer.cs
+++ b/src/Avalonia.Base/Input/Pointer.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Input
 
         public int Id { get; }
 
-        IInputElement? FindCommonParent(IInputElement? control1, IInputElement? control2)
+        static IInputElement? FindCommonParent(IInputElement? control1, IInputElement? control2)
         {
             if (control1 is not Visual c1 || control2 is not Visual c2)
                 return null;
@@ -54,7 +54,7 @@ namespace Avalonia.Input
                 v3.DetachedFromVisualTree += OnCaptureDetached;
         }
 
-        IInputElement? GetNextCapture(Visual parent)
+        static IInputElement? GetNextCapture(Visual parent)
         {
             return parent as IInputElement ?? parent.FindAncestorOfType<IInputElement>();
         }
diff --git a/src/Avalonia.Base/Input/TouchDevice.cs b/src/Avalonia.Base/Input/TouchDevice.cs
index 3f0d221a68..125d5fc813 100644
--- a/src/Avalonia.Base/Input/TouchDevice.cs
+++ b/src/Avalonia.Base/Input/TouchDevice.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Input
         private Rect _lastClickRect;
         private ulong _lastClickTime;
 
-        RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
+        static RawInputModifiers GetModifiers(RawInputModifiers modifiers, bool isLeftButtonDown)
         {
             var rv = modifiers &= RawInputModifiers.KeyboardMask;
             if (isLeftButtonDown)
diff --git a/src/Avalonia.Base/Layout/AttachedLayout.cs b/src/Avalonia.Base/Layout/AttachedLayout.cs
index 950ea34319..2b24ed02b0 100644
--- a/src/Avalonia.Base/Layout/AttachedLayout.cs
+++ b/src/Avalonia.Base/Layout/AttachedLayout.cs
@@ -184,7 +184,7 @@ namespace Avalonia.Layout
         /// </summary>
         protected void InvalidateArrange() => ArrangeInvalidated?.Invoke(this, EventArgs.Empty);
 
-        private VirtualizingLayoutContext GetVirtualizingLayoutContext(LayoutContext context)
+        private static VirtualizingLayoutContext GetVirtualizingLayoutContext(LayoutContext context)
         {
             if (context is VirtualizingLayoutContext virtualizingContext)
             {
diff --git a/src/Avalonia.Base/Layout/StackLayout.cs b/src/Avalonia.Base/Layout/StackLayout.cs
index 5c1797a7a4..e9093cc146 100644
--- a/src/Avalonia.Base/Layout/StackLayout.cs
+++ b/src/Avalonia.Base/Layout/StackLayout.cs
@@ -335,7 +335,7 @@ namespace Avalonia.Layout
             InvalidateLayout();
         }
 
-        private double GetAverageElementSize(
+        private static double GetAverageElementSize(
             Size availableSize,
             VirtualizingLayoutContext context,
             StackLayoutState stackLayoutState)
@@ -359,6 +359,6 @@ namespace Avalonia.Layout
 
         private void InvalidateLayout() => InvalidateMeasure();
 
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
+        private static FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((StackLayoutState)context.LayoutState!).FlowAlgorithm;
     }
 }
diff --git a/src/Avalonia.Base/Layout/UniformGridLayout.cs b/src/Avalonia.Base/Layout/UniformGridLayout.cs
index 225a491b60..c539396e75 100644
--- a/src/Avalonia.Base/Layout/UniformGridLayout.cs
+++ b/src/Avalonia.Base/Layout/UniformGridLayout.cs
@@ -557,6 +557,6 @@ namespace Avalonia.Layout
 
         private void InvalidateLayout() => InvalidateMeasure();
 
-        private FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
+        private static FlowLayoutAlgorithm GetFlowAlgorithm(VirtualizingLayoutContext context) => ((UniformGridLayoutState)context.LayoutState!).FlowAlgorithm;
     }
 }
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/PathMarkupParser.cs b/src/Avalonia.Base/Media/PathMarkupParser.cs
index 5e808488fc..7b9fdf9330 100644
--- a/src/Avalonia.Base/Media/PathMarkupParser.cs
+++ b/src/Avalonia.Base/Media/PathMarkupParser.cs
@@ -527,7 +527,7 @@ namespace Avalonia.Media
             return span.Slice(i);
         }
 
-        private bool ReadBool(ref ReadOnlySpan<char> span)
+        private static bool ReadBool(ref ReadOnlySpan<char> span)
         {
             span = SkipWhitespace(span);
             
@@ -551,7 +551,7 @@ namespace Avalonia.Media
             }
         }
 
-        private double ReadDouble(ref ReadOnlySpan<char> span)
+        private static double ReadDouble(ref ReadOnlySpan<char> span)
         {
             if (!ReadArgument(ref span, out var doubleValue))
             {
@@ -561,7 +561,7 @@ namespace Avalonia.Media
             return double.Parse(doubleValue.ToString(), CultureInfo.InvariantCulture);
         }
 
-        private Size ReadSize(ref ReadOnlySpan<char> span)
+        private static Size ReadSize(ref ReadOnlySpan<char> span)
         {
             var width = ReadDouble(ref span);
             span = ReadSeparator(span);
@@ -569,7 +569,7 @@ namespace Avalonia.Media
             return new Size(width, height);
         }
 
-        private Point ReadPoint(ref ReadOnlySpan<char> span)
+        private static Point ReadPoint(ref ReadOnlySpan<char> span)
         {
             var x = ReadDouble(ref span);
             span = ReadSeparator(span);
@@ -577,7 +577,7 @@ namespace Avalonia.Media
             return new Point(x, y);
         }
 
-        private Point ReadRelativePoint(ref ReadOnlySpan<char> span, Point origin)
+        private static Point ReadRelativePoint(ref ReadOnlySpan<char> span, Point origin)
         {
             var x = ReadDouble(ref span);
             span = ReadSeparator(span);
@@ -585,7 +585,7 @@ namespace Avalonia.Media
             return new Point(origin.X + x, origin.Y + y);
         }
 
-        private bool ReadCommand(ref ReadOnlySpan<char> span, out Command command, out bool relative)
+        private static bool ReadCommand(ref ReadOnlySpan<char> span, out Command command, out bool relative)
         {
             span = SkipWhitespace(span);
             if (span.IsEmpty)
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/Platform/AssetLoader.cs b/src/Avalonia.Base/Platform/AssetLoader.cs
index 8d3576d180..659cfb75df 100644
--- a/src/Avalonia.Base/Platform/AssetLoader.cs
+++ b/src/Avalonia.Base/Platform/AssetLoader.cs
@@ -187,13 +187,13 @@ namespace Avalonia.Platform
             throw new ArgumentException($"Unsupported url type: " + uri.Scheme, nameof(uri));
         }
 
-        private (IAssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
+        private static (IAssemblyDescriptor asm, string path) GetResAsmAndPath(Uri uri)
         {
             var asm = s_assemblyDescriptorResolver.GetAssembly(uri.Authority);
             return (asm, uri.GetUnescapeAbsolutePath());
         }
         
-        private IAssemblyDescriptor? GetAssembly(Uri? uri)
+        private static IAssemblyDescriptor? GetAssembly(Uri? uri)
         {
             if (uri != null)
             {
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/Animations/KeyFrameAnimationInstance.cs b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
index 570c6a6d07..e9f58be095 100644
--- a/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Animations/KeyFrameAnimationInstance.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Rendering.Composition.Animations
             if (elapsed < _delayTime)
             {
                 if (_delayBehavior == AnimationDelayBehavior.SetInitialValueBeforeDelay)
-                    return ExpressionVariant.Create(GetKeyFrame(ref ctx, _keyFrames[0]));
+                    return ExpressionVariant.Create(KeyFrameAnimationInstance<T>.GetKeyFrame(ref ctx, _keyFrames[0]));
                 return currentValue;
             }
 
@@ -95,7 +95,7 @@ namespace Avalonia.Rendering.Composition.Animations
             var iterationNumber = elapsed.Ticks / _duration.Ticks;
             if (_iterationBehavior == AnimationIterationBehavior.Count
                 && iterationNumber >= _iterationCount)
-                return ExpressionVariant.Create(GetKeyFrame(ref ctx, _keyFrames[_keyFrames.Length - 1]));
+                return ExpressionVariant.Create(KeyFrameAnimationInstance<T>.GetKeyFrame(ref ctx, _keyFrames[_keyFrames.Length - 1]));
             
             
             var evenIterationNumber = iterationNumber % 2 == 0;
@@ -124,13 +124,18 @@ namespace Avalonia.Rendering.Composition.Animations
                 {
                     // this is the last frame
                     if (c == _keyFrames.Length - 1)
-                        return ExpressionVariant.Create(GetKeyFrame(ref ctx, kf));
+                        return ExpressionVariant.Create(KeyFrameAnimationInstance<T>.GetKeyFrame(ref ctx, kf));
 
                     left = kf;
                     right = _keyFrames[c + 1];
                 }
                 else if (c == 0)
-                    return ExpressionVariant.Create(GetKeyFrame(ref ctx, kf));
+                {
+                    // The current progress is before the first frame, we implicitly use the starting value 
+                    // as the first frame in this case
+                    right = _keyFrames[c];
+                    break;
+                }
                 else
                     break;
             }
@@ -142,13 +147,13 @@ namespace Avalonia.Rendering.Composition.Animations
                 return currentValue;
             
             return ExpressionVariant.Create(_interpolator.Interpolate(
-                GetKeyFrame(ref ctx, left),
-                GetKeyFrame(ref ctx, right),
+                KeyFrameAnimationInstance<T>.GetKeyFrame(ref ctx, left),
+                KeyFrameAnimationInstance<T>.GetKeyFrame(ref ctx, right),
                 easedKeyProgress
             ));
         }
 
-        T GetKeyFrame(ref ExpressionEvaluationContext ctx, ServerKeyFrame<T> f)
+        static T GetKeyFrame(ref ExpressionEvaluationContext ctx, ServerKeyFrame<T> f)
         {
             if (f.Expression != null)
                 return f.Expression.Evaluate(ref ctx).CastOrDefault<T>();
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
index 6130f36983..ea8a408e6f 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositingRenderer.cs
@@ -124,7 +124,7 @@ public class CompositingRenderer : IRendererWithCompositor
         QueueUpdate();
     }
 
-    private void SyncChildren(Visual v)
+    private static void SyncChildren(Visual v)
     {
         //TODO: Optimize by moving that logic to Visual itself
         if(v.CompositionVisual == null)
diff --git a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
index d8a608651b..0c24d6cd44 100644
--- a/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/CompositionTarget.cs
@@ -62,7 +62,7 @@ namespace Avalonia.Rendering.Composition
             return point * m;
         }
 
-        bool TryGetInvertedTransform(CompositionVisual visual, out Matrix matrix)
+        static bool TryGetInvertedTransform(CompositionVisual visual, out Matrix matrix)
         {
             var m = visual.TryGetServerGlobalTransform();
             if (m == null)
@@ -75,7 +75,7 @@ namespace Avalonia.Rendering.Composition
             return m33.TryInvert(out matrix);
         }
 
-        bool TryTransformTo(CompositionVisual visual, Point globalPoint, out Point v)
+        static bool TryTransformTo(CompositionVisual visual, Point globalPoint, out Point v)
         {
             v = default;
             if (TryGetInvertedTransform(visual, out var m))
diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
index 30b57883fc..aae1fcb90e 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/CompositionDrawingContext.cs
@@ -368,7 +368,7 @@ internal class CompositionDrawingContext : IDrawingContextImpl, IDrawingContextW
             : null;
     }
     
-    private IDisposable? CreateChildScene(IBrush? brush)
+    private static IDisposable? CreateChildScene(IBrush? brush)
     {
         if (brush is VisualBrush visualBrush)
         {
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..c3bf861c47 100644
--- a/src/Avalonia.Base/Rendering/DeferredRenderer.cs
+++ b/src/Avalonia.Base/Rendering/DeferredRenderer.cs
@@ -272,7 +272,7 @@ namespace Avalonia.Rendering
             }
         }
 
-        Scene? TryGetChildScene(IRef<IDrawOperation>? op) => (op?.Item as BrushDrawOperation)?.Aux as Scene;
+        static Scene? TryGetChildScene(IRef<IDrawOperation>? op) => (op?.Item as BrushDrawOperation)?.Aux as Scene;
         
         /// <inheritdoc/>
         Size IVisualBrushRenderer.GetRenderTargetSize(IVisualBrush brush)
@@ -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/Rendering/SceneGraph/SceneBuilder.cs b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
index 86b42c0c4b..d54bd3fad8 100644
--- a/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Base/Rendering/SceneGraph/SceneBuilder.cs
@@ -318,7 +318,7 @@ namespace Avalonia.Rendering.SceneGraph
             }
         }
 
-        private void UpdateSize(Scene scene)
+        private static void UpdateSize(Scene scene)
         {
             var renderRoot = scene.Root.Visual as IRenderRoot;
             var newSize = renderRoot?.ClientSize ?? scene.Root.Visual.Bounds.Size;
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);
 
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/Visual.cs b/src/Avalonia.Base/Visual.cs
index f4fecc7c7a..7694119589 100644
--- a/src/Avalonia.Base/Visual.cs
+++ b/src/Avalonia.Base/Visual.cs
@@ -417,6 +417,7 @@ namespace Avalonia
             OnAttachedToVisualTree(e);
             AttachedToVisualTree?.Invoke(this, e);
             InvalidateVisual();
+            _visualRoot.Renderer?.RecalculateChildren(_visualParent!);
 
             if (ZIndex != 0 && VisualParent is Visual parent)
                 parent.HasNonUniformZIndexChildren = true;
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.ColorPicker/ColorSlider/ColorSlider.cs b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
index ec08e96d87..be320246b3 100644
--- a/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorSlider/ColorSlider.cs
@@ -154,7 +154,7 @@ namespace Avalonia.Controls.Primitives
         /// </summary>
         /// <param name="hsvColor">The <see cref="HsvColor"/> to round component values for.</param>
         /// <returns>A new <see cref="HsvColor"/> with rounded component values.</returns>
-        private HsvColor RoundComponentValues(HsvColor hsvColor)
+        private static HsvColor RoundComponentValues(HsvColor hsvColor)
         {
             return new HsvColor(
                 Math.Round(hsvColor.A, 2, MidpointRounding.AwayFromZero),
diff --git a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
index f0ed89fb3a..2df46889a9 100644
--- a/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
+++ b/src/Avalonia.Controls.ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -1146,7 +1146,7 @@ namespace Avalonia.Controls.Primitives
             });
         }
 
-        private void FillPixelForBox(
+        private static void FillPixelForBox(
             double x,
             double y,
             Hsv baseHsv,
diff --git a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
index ba285a701c..3ec78d6d6a 100644
--- a/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
@@ -56,7 +56,7 @@ namespace Avalonia.Controls
             set => SetAndRaise(CellEditingTemplateProperty, ref _cellEditingCellTemplate, value);
         }
         
-        private void OnCellTemplateChanged(AvaloniaPropertyChangedEventArgs e)
+        private static void OnCellTemplateChanged(AvaloniaPropertyChangedEventArgs e)
         {
             var oldValue = (IDataTemplate)e.OldValue;
             var value = (IDataTemplate)e.NewValue;
diff --git a/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
index 5ff291d972..5d71e7a8e4 100644
--- a/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
@@ -71,7 +71,7 @@ namespace Avalonia.Automation.Peers
             }
         }
 
-        private ExpandCollapseState ToState(bool value)
+        private static ExpandCollapseState ToState(bool value)
         {
             return value ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed;
         }
diff --git a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
index a92feec509..fe8b616e02 100644
--- a/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarBlackoutDatesCollection.cs
@@ -206,7 +206,7 @@ namespace Avalonia.Controls.Primitives
             return true;
         }
         
-        private void EnsureValidThread()
+        private static void EnsureValidThread()
         {
             Dispatcher.UIThread.VerifyAccess();
         }
diff --git a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
index 211b5edb0d..ac4159d536 100644
--- a/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
+++ b/src/Avalonia.Controls/Calendar/SelectedDatesCollection.cs
@@ -6,7 +6,6 @@
 using Avalonia.Threading;
 using System;
 using System.Collections.ObjectModel;
-using System.Threading;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -353,7 +352,7 @@ namespace Avalonia.Controls.Primitives
             return true;
         }
         
-        private void EnsureValidThread()
+        private static void EnsureValidThread()
         {
             Dispatcher.UIThread.VerifyAccess();
         }
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/Grid.cs b/src/Avalonia.Controls/Grid.cs
index 8d246d35f4..7737fdac2e 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -1165,7 +1165,7 @@ namespace Avalonia.Controls
         /// <remarks>
         /// For "Auto" definitions MinWidth is used in place of PreferredSize.
         /// </remarks>
-        private double GetMeasureSizeForRange(
+        private static double GetMeasureSizeForRange(
             IReadOnlyList<DefinitionBase> definitions,
             int start,
             int count)
@@ -1192,7 +1192,7 @@ namespace Avalonia.Controls
         /// <param name="start">Starting index of the range.</param>
         /// <param name="count">Number of definitions included in the range.</param>
         /// <returns>Length type for given range.</returns>
-        private LayoutTimeSizeType GetLengthTypeForRange(
+        private static LayoutTimeSizeType GetLengthTypeForRange(
             IReadOnlyList<DefinitionBase> definitions,
             int start,
             int count)
@@ -1721,7 +1721,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="definitions">Array of definitions to use for calculations.</param>
         /// <returns>Desired size.</returns>
-        private double CalculateDesiredSize(
+        private static double CalculateDesiredSize(
             IReadOnlyList<DefinitionBase> definitions)
         {
             double desiredSize = 0;
@@ -2281,7 +2281,7 @@ namespace Avalonia.Controls
         /// <param name="start">Start of the range.</param>
         /// <param name="count">Number of items in the range.</param>
         /// <returns>Final size.</returns>
-        private double GetFinalSizeForRange(
+        private static double GetFinalSizeForRange(
             IReadOnlyList<DefinitionBase> definitions,
             int start,
             int count)
diff --git a/src/Avalonia.Controls/GridSplitter.cs b/src/Avalonia.Controls/GridSplitter.cs
index 9bdefed6b6..4684304725 100644
--- a/src/Avalonia.Controls/GridSplitter.cs
+++ b/src/Avalonia.Controls/GridSplitter.cs
@@ -516,7 +516,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Retrieves the ActualWidth or ActualHeight of the definition depending on its type Column or Row.
         /// </summary>
-        private double GetActualLength(DefinitionBase definition)
+        private static double GetActualLength(DefinitionBase definition)
         {
             var column = definition as ColumnDefinition;
 
diff --git a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
index 4cc6a20082..381f1799d4 100644
--- a/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
+++ b/src/Avalonia.Controls/MenuItemAccessKeyHandler.cs
@@ -14,7 +14,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// The registered access keys.
         /// </summary>
-        private readonly List<Tuple<string, IInputElement>> _registered = new List<Tuple<string, IInputElement>>();
+        private readonly List<(string AccessKey, IInputElement Element)> _registered = new();
 
         /// <summary>
         /// The window to which the handler belongs.
@@ -59,12 +59,12 @@ namespace Avalonia.Controls
         {
             var existing = _registered.FirstOrDefault(x => x.Item2 == element);
 
-            if (existing != null)
+            if (existing != default)
             {
                 _registered.Remove(existing);
             }
 
-            _registered.Add(Tuple.Create(accessKey.ToString().ToUpper(), element));
+            _registered.Add((accessKey.ToString().ToUpperInvariant(), element));
         }
 
         /// <summary>
@@ -88,9 +88,10 @@ namespace Avalonia.Controls
         {
             if (!string.IsNullOrWhiteSpace(e.Text))
             {
-                var text = e.Text.ToUpper();
+                var text = e.Text;
                 var focus = _registered
-                    .FirstOrDefault(x => x.Item1 == text && x.Item2.IsEffectivelyVisible)?.Item2;
+                    .FirstOrDefault(x => string.Equals(x.AccessKey, text, StringComparison.OrdinalIgnoreCase)
+                        && x.Element.IsEffectivelyVisible).Element;
 
                 focus?.RaiseEvent(new RoutedEventArgs(AccessKeyHandler.AccessKeyPressedEvent));
 
diff --git a/src/Avalonia.Controls/Platform/InProcessDragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
index 676a1587a8..5b2356a7ce 100644
--- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs
+++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Platform
             return effect;
         }
 
-        private DragDropEffects GetPreferredEffect(DragDropEffects effect, RawInputModifiers modifiers)
+        private static DragDropEffects GetPreferredEffect(DragDropEffects effect, RawInputModifiers modifiers)
         {
             if (effect == DragDropEffects.Copy || effect == DragDropEffects.Move || effect == DragDropEffects.Link || effect == DragDropEffects.None)
                 return effect; // No need to check for the modifiers.
@@ -80,7 +80,7 @@ namespace Avalonia.Platform
             return DragDropEffects.Move;
         }
 
-        private StandardCursorType GetCursorForDropEffect(DragDropEffects effects)
+        private static StandardCursorType GetCursorForDropEffect(DragDropEffects effects)
         {
             if (effects.HasAllFlags(DragDropEffects.Copy))
                 return StandardCursorType.DragCopy;
diff --git a/src/Avalonia.Controls/Primitives/Popup.cs b/src/Avalonia.Controls/Primitives/Popup.cs
index 337ff54985..3c329a9a3e 100644
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Linq;
 using System.Reactive.Disposables;
 using Avalonia.Automation.Peers;
 using Avalonia.Controls.Mixins;
@@ -15,7 +14,6 @@ using Avalonia.Metadata;
 using Avalonia.Platform;
 using Avalonia.VisualTree;
 using Avalonia.Media;
-using Avalonia.Utilities;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -639,7 +637,7 @@ namespace Avalonia.Controls.Primitives
             return Disposable.Create((unsubscribe, target, handler), state => state.unsubscribe(state.target, state.handler));
         }
 
-        private void WindowManagerAddShadowHintChanged(IPopupHost host, bool hint)
+        private static void WindowManagerAddShadowHintChanged(IPopupHost host, bool hint)
         {
             if(host is PopupRoot pr && pr.PlatformImpl is not null)
             {
@@ -769,7 +767,7 @@ namespace Avalonia.Controls.Primitives
             }
         }
 
-        private void PassThroughEvent(PointerPressedEventArgs e)
+        private static void PassThroughEvent(PointerPressedEventArgs e)
         {
             if (e.Source is LightDismissOverlayLayer layer &&
                 layer.GetVisualRoot() is InputElement root)
diff --git a/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs
index 35bd5aeecb..9132bef3d9 100644
--- a/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs
+++ b/src/Avalonia.Controls/Repeater/RecyclingElementFactory.cs
@@ -87,7 +87,7 @@ namespace Avalonia.Controls
 
         protected virtual string OnSelectTemplateKeyCore(object? dataContext, Control? owner)
         {
-            if (SelectTemplateKey is object)
+            if (SelectTemplateKey is not null)
             {
                 _args ??= new SelectTemplateEventArgs();
                 _args.TemplateKey = null;
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.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)
                 {
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.Controls/SplitView.cs b/src/Avalonia.Controls/SplitView.cs
index 29add8720b..fcadafaab5 100644
--- a/src/Avalonia.Controls/SplitView.cs
+++ b/src/Avalonia.Controls/SplitView.cs
@@ -1,14 +1,11 @@
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Input.Raw;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Metadata;
-using Avalonia.Platform;
 using Avalonia.VisualTree;
 using System;
-using System.Reactive.Disposables;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.LogicalTree;
@@ -431,7 +428,7 @@ namespace Avalonia.Controls
             }
         }
 
-        private string GetPseudoClass(SplitViewDisplayMode mode)
+        private static string GetPseudoClass(SplitViewDisplayMode mode)
         {
             return mode switch
             {
@@ -443,7 +440,7 @@ namespace Avalonia.Controls
             };
         }
         
-        private string GetPseudoClass(SplitViewPanePlacement placement)
+        private static string GetPseudoClass(SplitViewPanePlacement placement)
         {
             return placement switch
             {
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 358bcfdad7..699170df5a 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -1588,7 +1588,7 @@ namespace Avalonia.Controls
 
         private int CoerceCaretIndex(int value) => CoerceCaretIndex(value, Text);
 
-        private int CoerceCaretIndex(int value, string? text)
+        private static int CoerceCaretIndex(int value, string? text)
         {
             if (text == null)
             {
diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 0e04d92d6e..59ad696148 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -427,7 +427,7 @@ namespace Avalonia.Controls
             LayoutHelper.InvalidateSelfAndChildrenMeasure(this);
         }
 
-        private bool TransparencyLevelsMatch (WindowTransparencyLevel requested, WindowTransparencyLevel received)
+        private static bool TransparencyLevelsMatch (WindowTransparencyLevel requested, WindowTransparencyLevel received)
         {
             if(requested == received)
             {
diff --git a/src/Avalonia.Controls/UserControl.cs b/src/Avalonia.Controls/UserControl.cs
index 7b9cc2da1c..e9339d5f4b 100644
--- a/src/Avalonia.Controls/UserControl.cs
+++ b/src/Avalonia.Controls/UserControl.cs
@@ -1,4 +1,3 @@
-using System;
 using Avalonia.Styling;
 
 namespace Avalonia.Controls
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.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index 444e65e623..2117996b96 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -47,7 +47,7 @@ namespace Avalonia.Diagnostics.Screenshots
         /// </summary>
         public string Title { get; } = "Save Screenshot to ...";
 
-        Window GetWindow(Control control)
+        static Window GetWindow(Control control)
         {
             var window = control.VisualRoot as Window;
             var app = Application.Current;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 0206ede277..5cf9e17ecf 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -82,7 +82,7 @@ namespace Avalonia.Diagnostics.ViewModels
                             {
                                 var setterValue = regularSetter.Value;
 
-                                var resourceInfo = GetResourceInfo(setterValue);
+                                var resourceInfo =  GetResourceInfo(setterValue);
 
                                 SetterViewModel setterVm;
 
@@ -121,7 +121,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         public bool CanNavigateToParentProperty => _selectedEntitiesStack.Count >= 1;
 
-        private (object resourceKey, bool isDynamic)? GetResourceInfo(object? value)
+        private static (object resourceKey, bool isDynamic)? GetResourceInfo(object? value)
         {
             if (value is StaticResourceExtension staticResource)
             {
@@ -136,7 +136,7 @@ namespace Avalonia.Diagnostics.ViewModels
             return null;
         }
 
-        private bool IsBinding(object? value)
+        private static bool IsBinding(object? value)
         {
             switch (value)
             {
@@ -253,7 +253,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        private IEnumerable<PropertyViewModel> GetAvaloniaProperties(object o)
+        private static IEnumerable<PropertyViewModel> GetAvaloniaProperties(object o)
         {
             if (o is AvaloniaObject ao)
             {
@@ -267,7 +267,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        private IEnumerable<PropertyViewModel> GetClrProperties(object o, bool showImplementedInterfaces)
+        private static IEnumerable<PropertyViewModel> GetClrProperties(object o, bool showImplementedInterfaces)
         {
             foreach (var p in GetClrProperties(o, o.GetType()))
             {
@@ -286,7 +286,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        private IEnumerable<PropertyViewModel> GetClrProperties(object o, Type t)
+        private static IEnumerable<PropertyViewModel> GetClrProperties(object o, Type t)
         {
             return t.GetProperties()
                 .Where(x => x.GetIndexParameters().Length == 0)
@@ -411,7 +411,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 }
             }
 
-            private int GroupIndex(string? group)
+            private static int GroupIndex(string? group)
             {
                 switch (group)
                 {
diff --git a/src/Avalonia.Dialogs/ManagedStorageProvider.cs b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
index 2c88251cca..e45d5c1b4a 100644
--- a/src/Avalonia.Dialogs/ManagedStorageProvider.cs
+++ b/src/Avalonia.Dialogs/ManagedStorageProvider.cs
@@ -29,7 +29,7 @@ public class ManagedStorageProvider<T> : BclStorageProvider where T : Window, ne
     public override async Task<IReadOnlyList<IStorageFile>> OpenFilePickerAsync(FilePickerOpenOptions options)
     {
         var model = new ManagedFileChooserViewModel(options, _managedOptions);
-        var results = await Show(model, _parent);
+        var results = await ManagedStorageProvider<T>.Show(model, _parent);
 
         return results.Select(f => new BclStorageFile(new FileInfo(f))).ToArray();
     }
@@ -37,7 +37,7 @@ public class ManagedStorageProvider<T> : BclStorageProvider where T : Window, ne
     public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options)
     {
         var model = new ManagedFileChooserViewModel(options, _managedOptions);
-        var results = await Show(model, _parent);
+        var results = await ManagedStorageProvider<T>.Show(model, _parent);
 
         return results.FirstOrDefault() is { } result
             ? new BclStorageFile(new FileInfo(result))
@@ -47,12 +47,12 @@ public class ManagedStorageProvider<T> : BclStorageProvider where T : Window, ne
     public override async Task<IReadOnlyList<IStorageFolder>> OpenFolderPickerAsync(FolderPickerOpenOptions options)
     {
         var model = new ManagedFileChooserViewModel(options, _managedOptions);
-        var results = await Show(model, _parent);
+        var results = await ManagedStorageProvider<T>.Show(model, _parent);
 
         return results.Select(f => new BclStorageFolder(new DirectoryInfo(f))).ToArray();
     }
             
-    private async Task<string[]> Show(ManagedFileChooserViewModel model, Window parent)
+    private static async Task<string[]> Show(ManagedFileChooserViewModel model, Window parent)
     {
         var dialog = new T
         {
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/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
index 39ddd9d769..34c1506a67 100644
--- a/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
+++ b/src/Avalonia.FreeDesktop/LinuxMountedVolumeInfoListener.cs
@@ -34,14 +34,14 @@ namespace Avalonia.FreeDesktop
             Poll(0);
         }
 
-        private string GetSymlinkTarget(string x) => Path.GetFullPath(Path.Combine(DevByLabelDir, NativeMethods.ReadLink(x)));
+        private static string GetSymlinkTarget(string x) => Path.GetFullPath(Path.Combine(DevByLabelDir, NativeMethods.ReadLink(x)));
 
-        private string UnescapeString(string input, string regexText, int escapeBase) =>
+        private static string UnescapeString(string input, string regexText, int escapeBase) =>
             new Regex(regexText).Replace(input, m => Convert.ToChar(Convert.ToByte(m.Groups[1].Value, escapeBase)).ToString());
 
-        private string UnescapePathFromProcMounts(string input) => UnescapeString(input, @"\\(\d{3})", 8);
+        private static string UnescapePathFromProcMounts(string input) => UnescapeString(input, @"\\(\d{3})", 8);
 
-        private string UnescapeDeviceLabel(string input) => UnescapeString(input, @"\\x([0-9a-f]{2})", 16);
+        private static string UnescapeDeviceLabel(string input) => UnescapeString(input, @"\\x([0-9a-f]{2})", 16);
 
         private void Poll(long _)
         {
diff --git a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
index d8753efe25..7c7b32f7e4 100644
--- a/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
+++ b/src/Avalonia.Native/AvaloniaNativeMenuExporter.cs
@@ -65,7 +65,7 @@ namespace Avalonia.Native
             }
         }
 
-        private NativeMenu CreateDefaultAppMenu()
+        private static NativeMenu CreateDefaultAppMenu()
         {
             var result = new NativeMenu();
 
diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs
index 7ce50c5126..3e46e0c5c6 100644
--- a/src/Avalonia.Native/IAvnMenu.cs
+++ b/src/Avalonia.Native/IAvnMenu.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Reactive.Disposables;
 using Avalonia.Controls;
-using Avalonia.Platform.Interop;
 
 namespace Avalonia.Native.Interop
 {
@@ -112,7 +111,7 @@ namespace Avalonia.Native.Interop.Impl
             return result;
         }
 
-        private __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item)
+        private static __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item)
         {
             var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeparator ?
                 factory.CreateMenuItemSeparator() :
diff --git a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
index 279e7e750d..e13ee80864 100644
--- a/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
+++ b/src/Avalonia.OpenGL/Controls/OpenGlControlBase.cs
@@ -38,7 +38,7 @@ namespace Avalonia.OpenGL.Controls
             base.Render(context);
         }
         
-        private void CheckError(GlInterface gl)
+        private static void CheckError(GlInterface gl)
         {
             int err;
             while ((err = gl.GetError()) != GL_NO_ERROR)
@@ -197,7 +197,7 @@ namespace Avalonia.OpenGL.Controls
             }
         }
 
-        private bool CheckFramebufferStatus(GlInterface gl)
+        private static bool CheckFramebufferStatus(GlInterface gl)
         {
             var status = gl.CheckFramebufferStatus(GL_FRAMEBUFFER);
             if (status != GL_FRAMEBUFFER_COMPLETE)
diff --git a/src/Avalonia.Remote.Protocol/MetsysBson.cs b/src/Avalonia.Remote.Protocol/MetsysBson.cs
index 6abece6bf3..8aaab933e9 100644
--- a/src/Avalonia.Remote.Protocol/MetsysBson.cs
+++ b/src/Avalonia.Remote.Protocol/MetsysBson.cs
@@ -562,7 +562,7 @@ namespace Metsys.Bson
         {
             if (_string == null && Value != null)
             {
-                _string = BitConverter.ToString(Value).Replace("-", string.Empty).ToLower();
+                _string = BitConverter.ToString(Value).Replace("-", string.Empty).ToLowerInvariant();
             }
 
             return _string;
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.Fluent/Controls/Slider.xaml b/src/Avalonia.Themes.Fluent/Controls/Slider.xaml
index 1e3f51f7ef..6e9e37643e 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">
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>
 
diff --git a/src/Avalonia.X11/X11IconLoader.cs b/src/Avalonia.X11/X11IconLoader.cs
index 632a7d39a2..4ae1c1599f 100644
--- a/src/Avalonia.X11/X11IconLoader.cs
+++ b/src/Avalonia.X11/X11IconLoader.cs
@@ -9,7 +9,7 @@ namespace Avalonia.X11
 {
     class X11IconLoader : IPlatformIconLoader
     {
-        IWindowIconImpl LoadIcon(Bitmap bitmap)
+        static IWindowIconImpl LoadIcon(Bitmap bitmap)
         {
             var rv = new X11IconData(bitmap);
             bitmap.Dispose();
diff --git a/src/Avalonia.X11/X11Platform.cs b/src/Avalonia.X11/X11Platform.cs
index 96dc16e186..cbb782edd0 100644
--- a/src/Avalonia.X11/X11Platform.cs
+++ b/src/Avalonia.X11/X11Platform.cs
@@ -5,7 +5,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
-using Avalonia.Dialogs;
 using Avalonia.FreeDesktop;
 using Avalonia.FreeDesktop.DBusIme;
 using Avalonia.Input;
@@ -85,7 +84,7 @@ namespace Avalonia.X11
                 .Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())
                 .Bind<IPlatformLifetimeEventsImpl>().ToConstant(new X11PlatformLifetimeEvents(this));
             
-            X11Screens = Avalonia.X11.X11Screens.Init(this);
+            X11Screens = X11.X11Screens.Init(this);
             Screens = new X11Screens(X11Screens);
             if (Info.XInputVersion != null)
             {
@@ -143,7 +142,7 @@ namespace Avalonia.X11
             throw new NotSupportedException();
         }
 
-        bool EnableIme(X11PlatformOptions options)
+        static bool EnableIme(X11PlatformOptions options)
         {
             // Disable if explicitly asked by user
             var avaloniaImModule = Environment.GetEnvironmentVariable("AVALONIA_IM_MODULE");
@@ -164,8 +163,8 @@ namespace Avalonia.X11
 
             return isCjkLocale;
         }
-        
-        bool ShouldUseXim()
+
+        static bool ShouldUseXim()
         {
             // Check if we are forbidden from using IME
             if (Environment.GetEnvironmentVariable("AVALONIA_IM_MODULE") == "none"
diff --git a/src/Avalonia.X11/X11Window.Ime.cs b/src/Avalonia.X11/X11Window.Ime.cs
index ca987d0a07..257580a5ec 100644
--- a/src/Avalonia.X11/X11Window.Ime.cs
+++ b/src/Avalonia.X11/X11Window.Ime.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using Avalonia.FreeDesktop;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs
index 330494d5dc..2f84e15b32 100644
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
-using System.Reactive.Disposables;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading;
@@ -683,7 +681,7 @@ namespace Avalonia.X11
 
         }
 
-        RawInputModifiers TranslateModifiers(XModifierMask state)
+        static RawInputModifiers TranslateModifiers(XModifierMask state)
         {
             var rv = default(RawInputModifiers);
             if (state.HasAllFlags(XModifierMask.Button1Mask))
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.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
index 6c9d510ba0..264361e743 100644
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/XamlIlAvaloniaPropertyHelper.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml;
 using Avalonia.Markup.Xaml.Parsers;
 using Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
 using Avalonia.Utilities;
-using XamlX;
 using XamlX.Ast;
 using XamlX.Transform;
 using XamlX.Transform.Transformers;
@@ -67,10 +65,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions
             string propertyName, IXamlAstTypeReference selectorTypeReference, IXamlLineInfo lineInfo)
         {
             XamlAstNamePropertyReference forgedReference;
-            
-            var parser = new PropertyParser();
-            
-            var parsedPropertyName = parser.Parse(new CharacterReader(propertyName.AsSpan()));
+
+            var parsedPropertyName = PropertyParser.Parse(new CharacterReader(propertyName.AsSpan()));
             if(parsedPropertyName.owner == null)
                 forgedReference = new XamlAstNamePropertyReference(lineInfo, selectorTypeReference,
                     propertyName, selectorTypeReference);
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
index 45ca1c4adc..35d0c01730 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Globalization;
 using Avalonia.Controls;
 using Avalonia.Logging;
-using Avalonia.Markup.Parsers;
 using Avalonia.Markup.Xaml.Parsers;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Styling;
@@ -21,8 +20,7 @@ namespace Avalonia.Markup.Xaml.Converters
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
             var registry = AvaloniaPropertyRegistry.Instance;
-            var parser = new PropertyParser();
-            var (ns, owner, propertyName) = parser.Parse(new CharacterReader(((string)value).AsSpan()));
+            var (ns, owner, propertyName) = PropertyParser.Parse(new CharacterReader(((string)value).AsSpan()));
             var ownerType = TryResolveOwnerByName(context, ns, owner);
             var targetType = context.GetFirstParent<ControlTemplate>()?.TargetType ??
                 context.GetFirstParent<Style>()?.Selector?.TargetType ??
@@ -37,7 +35,7 @@ namespace Avalonia.Markup.Xaml.Converters
 
             if (effectiveOwner != targetType &&
                 !property.IsAttached &&
-                !registry.IsRegistered(targetType, property))
+                !AvaloniaPropertyRegistry.Instance.IsRegistered(targetType, property))
             {
                 Logger.TryGet(LogEventLevel.Warning, LogArea.Property)?.Log(
                     this,
@@ -50,7 +48,7 @@ namespace Avalonia.Markup.Xaml.Converters
             return property;
         }
 
-        private Type TryResolveOwnerByName(ITypeDescriptorContext context, string ns, string owner)
+        private static Type TryResolveOwnerByName(ITypeDescriptorContext context, string ns, string owner)
         {
             if (owner != null)
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
index 9e15fb888e..24b690b6f1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/IconTypeConverter.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Markup.Xaml.Converters
             throw new NotSupportedException();
         }
 
-        private WindowIcon CreateIconFromPath(ITypeDescriptorContext context, string s)
+        private static WindowIcon CreateIconFromPath(ITypeDescriptorContext context, string s)
         {
             var uri = s.StartsWith("/")
                 ? new Uri(s, UriKind.Relative)
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}]");
                 }
             }
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index fb845cf4e6..6084de7d7d 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             return null;
         }
 
-        private Func<object?, object?>? GetConverter(AvaloniaProperty? targetProperty)
+        private static Func<object?, object?>? GetConverter(AvaloniaProperty? targetProperty)
         {
             if (targetProperty?.PropertyType == typeof(IBrush))
             {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
index ea94012096..507e0690fd 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Parsers/PropertyParser.cs
@@ -1,13 +1,11 @@
-using System;
-using Avalonia.Data.Core;
-using Avalonia.Markup.Parsers;
+using Avalonia.Data.Core;
 using Avalonia.Utilities;
 
 namespace Avalonia.Markup.Xaml.Parsers
 {
     internal class PropertyParser
     {
-        public (string ns, string owner, string name) Parse(CharacterReader r)
+        public static (string ns, string owner, string name) Parse(CharacterReader r)
         {
             if (r.End)
             {
diff --git a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
index 9c505486b7..6176608196 100644
--- a/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
+++ b/src/Markup/Avalonia.Markup/Markup/Parsers/Nodes/StringIndexerNode.cs
@@ -113,7 +113,7 @@ namespace Avalonia.Markup.Parsers.Nodes
         }
 
 
-        private bool SetValueInArray(Array array, int[] indices, object? value)
+        private static bool SetValueInArray(Array array, int[] indices, object? value)
         {
             if (ValidBounds(indices, array))
             {
@@ -223,7 +223,7 @@ namespace Avalonia.Markup.Parsers.Nodes
             return GetValueFromArray(array, intArgs);
         }
 
-        private object? GetValueFromArray(Array array, int[] indices)
+        private static object? GetValueFromArray(Array array, int[] indices)
         {
             if (ValidBounds(indices, array))
             {
@@ -275,7 +275,7 @@ namespace Avalonia.Markup.Parsers.Nodes
             return null;
         }
 
-        private bool ValidBounds(int[] indices, Array array)
+        private static bool ValidBounds(int[] indices, Array array)
         {
             if (indices.Length == array.Rank)
             {
diff --git a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
index 6dcafdcfd7..f18330ba8a 100644
--- a/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
+++ b/src/Skia/Avalonia.Skia/DrawingContextImpl.cs
@@ -280,7 +280,7 @@ namespace Avalonia.Skia
             }
         }
 
-        SKRect AreaCastingShadowInHole(
+        static SKRect AreaCastingShadowInHole(
             SKRect hole_rect,
             float shadow_blur,
             float shadow_spread,
@@ -689,7 +689,7 @@ namespace Avalonia.Skia
         /// <param name="paintWrapper">Paint wrapper.</param>
         /// <param name="targetSize">Target size.</param>
         /// <param name="gradientBrush">Gradient brush.</param>
-        private void ConfigureGradientBrush(ref PaintWrapper paintWrapper, Size targetSize, IGradientBrush gradientBrush)
+        private static void ConfigureGradientBrush(ref PaintWrapper paintWrapper, Size targetSize, IGradientBrush gradientBrush)
         {
             var tileMode = gradientBrush.SpreadMethod.ToSKShaderTileMode();
             var stopColors = gradientBrush.GradientStops.Select(s => s.Color.ToSKColor()).ToArray();
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
index bc0a399d7f..a5474803a1 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
@@ -113,7 +113,8 @@ namespace Avalonia.Win32.Interop.Wpf
 
         [DllImport("user32.dll", SetLastError = false)]
         private static extern IntPtr GetDesktopWindow();
-        void EnsureDirectX()
+
+        static void EnsureDirectX()
         {
             if(s_d3DDevice != null)
                 return;
@@ -153,7 +154,7 @@ namespace Avalonia.Win32.Interop.Wpf
                 _oldDpi = dpi;
             }
             _impl.ImageSource = _image;
-            
+
             RemoveAndDispose(ref _backBuffer);
             if (size == default(IntSize))
             {
@@ -167,7 +168,7 @@ namespace Avalonia.Win32.Interop.Wpf
             return _backBuffer.Target;
         }
 
-        void RemoveAndDispose<T>(ref T d) where T : IDisposable
+        static void RemoveAndDispose<T>(ref T d) where T : IDisposable
         {
             d?.Dispose();
             d = default(T);
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
index 0814be24c0..1dcf45aa4e 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
@@ -142,8 +142,7 @@ namespace Avalonia.Win32.Interop.Wpf
 
         protected override void OnLostFocus(RoutedEventArgs e) => LostFocus?.Invoke();
 
-
-        RawInputModifiers GetModifiers(MouseEventArgs e)
+        static RawInputModifiers GetModifiers(MouseEventArgs e)
         {
             var state = Keyboard.Modifiers;
             var rv = default(RawInputModifiers);
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 308e22b4e2..00ce309519 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.0" PrivateAssets="all" />
     <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
     <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
+    <MicroComIdl Include="DirectX\directx.idl" CSharpInteropPath="DirectX\directx.Generated.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="..\..\Shared\ModuleInitializer.cs" />
diff --git a/src/Windows/Avalonia.Win32/ClipboardImpl.cs b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
index 7e058cb052..6153c7c75c 100644
--- a/src/Windows/Avalonia.Win32/ClipboardImpl.cs
+++ b/src/Windows/Avalonia.Win32/ClipboardImpl.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Win32
         private const int OleRetryCount = 10;
         private const int OleRetryDelay = 100;
 
-        private async Task<IDisposable> OpenClipboard()
+        private static async Task<IDisposable> OpenClipboard()
         {
             var i = OleRetryCount;
 
diff --git a/src/Windows/Avalonia.Win32/CursorFactory.cs b/src/Windows/Avalonia.Win32/CursorFactory.cs
index 0a0e45b03a..862e99be19 100644
--- a/src/Windows/Avalonia.Win32/CursorFactory.cs
+++ b/src/Windows/Avalonia.Win32/CursorFactory.cs
@@ -107,7 +107,7 @@ namespace Avalonia.Win32
             return new CursorImpl(UnmanagedMethods.CreateIconIndirect(ref info), true);
         }
 
-        private SdBitmap LoadSystemDrawingBitmap(IBitmapImpl bitmap)
+        private static SdBitmap LoadSystemDrawingBitmap(IBitmapImpl bitmap)
         {
             using var memoryStream = new MemoryStream();
             bitmap.Save(memoryStream);
diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs
index 7a96ca9ee0..27560df35e 100644
--- a/src/Windows/Avalonia.Win32/DataObject.cs
+++ b/src/Windows/Avalonia.Win32/DataObject.cs
@@ -291,7 +291,7 @@ namespace Avalonia.Win32
             return WriteBytesToHGlobal(ref hGlobal, SerializeObject(data));
         }
 
-        private byte[] SerializeObject(object data)
+        private static byte[] SerializeObject(object data)
         {
             using (var ms = new MemoryStream())
             {
@@ -302,7 +302,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private unsafe uint WriteBytesToHGlobal(ref IntPtr hGlobal, ReadOnlySpan<byte> data)
+        private static unsafe uint WriteBytesToHGlobal(ref IntPtr hGlobal, ReadOnlySpan<byte> data)
         {
             int required = data.Length;
             if (hGlobal == IntPtr.Zero)
@@ -326,7 +326,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private uint WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
+        private static uint WriteFileListToHGlobal(ref IntPtr hGlobal, IEnumerable<string> files)
         {
             if (!files?.Any() ?? false)
                 return unchecked((int)UnmanagedMethods.HRESULT.S_OK);
@@ -358,7 +358,7 @@ namespace Avalonia.Win32
             }
         }
 
-        private uint WriteStringToHGlobal(ref IntPtr hGlobal, string data)
+        private static uint WriteStringToHGlobal(ref IntPtr hGlobal, string data)
         {
             int required = (data.Length + 1) * sizeof(char);
             if (hGlobal == IntPtr.Zero)
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs
new file mode 100644
index 0000000000..3a67da530f
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXEnums.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+    internal enum D3D_FEATURE_LEVEL
+    {
+        D3D_FEATURE_LEVEL_1_0_CORE = 0x1000,
+
+        D3D_FEATURE_LEVEL_9_1 = 0x9100,
+
+        D3D_FEATURE_LEVEL_9_2 = 0x9200,
+
+        D3D_FEATURE_LEVEL_9_3 = 0x9300,
+
+        D3D_FEATURE_LEVEL_10_0 = 0xa000,
+
+        D3D_FEATURE_LEVEL_10_1 = 0xa100,
+
+        D3D_FEATURE_LEVEL_11_0 = 0xb000,
+
+        D3D_FEATURE_LEVEL_11_1 = 0xb100,
+
+        D3D_FEATURE_LEVEL_12_0 = 0xc000,
+
+        D3D_FEATURE_LEVEL_12_1 = 0xc100,
+
+        D3D_FEATURE_LEVEL_12_2 = 0xc200,
+    }
+
+    internal enum D3D11_RESOURCE_DIMENSION
+    {
+        D3D11_USAGE_DEFAULT = 0,
+
+        D3D11_USAGE_IMMUTABLE = 1,
+
+        D3D11_USAGE_DYNAMIC = 2,
+
+        D3D11_USAGE_STAGING = 3,
+    }
+
+    internal enum D3D11_USAGE
+    {
+        D3D11_USAGE_DEFAULT = 0,
+
+        D3D11_USAGE_IMMUTABLE = 1,
+
+        D3D11_USAGE_DYNAMIC = 2,
+
+        D3D11_USAGE_STAGING = 3,
+    }
+    internal enum DXGI_SWAP_EFFECT
+    {
+        DXGI_SWAP_EFFECT_DISCARD = 0,
+
+        DXGI_SWAP_EFFECT_SEQUENTIAL = 1,
+
+        DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3,
+
+        DXGI_SWAP_EFFECT_FLIP_DISCARD = 4,
+    }
+    
+    [Flags]
+    internal enum DXGI_SWAP_CHAIN_FLAG
+    {
+        DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1,
+
+        DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2,
+
+        DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4,
+
+        DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT = 8,
+
+        DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 16,
+
+        DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 32,
+
+        DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 64,
+
+        DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 128,
+
+        DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 256,
+
+        DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 512,
+
+        DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED = 1024,
+
+        DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING = 2048,
+
+        DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS = 4096,
+    }
+    
+    internal enum DXGI_SCALING
+    {
+        DXGI_SCALING_STRETCH = 0,
+
+        DXGI_SCALING_NONE = 1,
+
+        DXGI_SCALING_ASPECT_RATIO_STRETCH = 2,
+    }
+
+    internal enum DXGI_RESIDENCY
+    {
+        DXGI_RESIDENCY_FULLY_RESIDENT = 1,
+
+        DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2,
+
+        DXGI_RESIDENCY_EVICTED_TO_DISK = 3,
+    }
+
+    internal enum DXGI_MODE_ROTATION
+    {
+        DXGI_MODE_ROTATION_UNSPECIFIED = 0,
+
+        DXGI_MODE_ROTATION_IDENTITY = 1,
+
+        DXGI_MODE_ROTATION_ROTATE90 = 2,
+
+        DXGI_MODE_ROTATION_ROTATE180 = 3,
+
+        DXGI_MODE_ROTATION_ROTATE270 = 4,
+    }
+
+    internal enum DXGI_ALPHA_MODE
+    {
+        DXGI_ALPHA_MODE_UNSPECIFIED = 0,
+
+        DXGI_ALPHA_MODE_PREMULTIPLIED = 1,
+
+        DXGI_ALPHA_MODE_STRAIGHT = 2,
+
+        DXGI_ALPHA_MODE_IGNORE = 3,
+
+        DXGI_ALPHA_MODE_FORCE_DWORD = (unchecked((int)0xffffffff)),
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
new file mode 100644
index 0000000000..d606b00109
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXStructs.cs
@@ -0,0 +1,1370 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+#nullable enable
+    public unsafe struct HANDLE
+    {
+        public readonly void* Value;
+
+        public HANDLE(void* value)
+        {
+            Value = value;
+        }
+
+        public static HANDLE INVALID_VALUE => new HANDLE((void*)(-1));
+
+        public static HANDLE NULL => new HANDLE(null);
+
+        public static bool operator ==(HANDLE left, HANDLE right) => left.Value == right.Value;
+
+        public static bool operator !=(HANDLE left, HANDLE right) => left.Value != right.Value;
+
+        public override bool Equals(object? obj) => (obj is HANDLE other) && Equals(other);
+
+        public bool Equals(HANDLE other) => ((nuint)(Value)).Equals((nuint)(other.Value));
+
+        public override int GetHashCode() => ((nuint)(Value)).GetHashCode();
+
+        public override string ToString() => ((IntPtr)Value).ToString();
+    }
+
+    internal unsafe partial struct MONITORINFOEXW
+    {
+        internal MONITORINFO Base;
+
+        internal fixed ushort szDevice[32];
+    }
+
+    internal unsafe struct DXGI_GAMMA_CONTROL
+    {
+        public DXGI_RGB Scale;
+
+        public DXGI_RGB Offset;
+
+        public _GammaCurve_e__FixedBuffer GammaCurve;
+
+        public partial struct _GammaCurve_e__FixedBuffer
+        {
+            public DXGI_RGB e0;
+            public DXGI_RGB e1;
+            public DXGI_RGB e2;
+            public DXGI_RGB e3;
+            public DXGI_RGB e4;
+            public DXGI_RGB e5;
+            public DXGI_RGB e6;
+            public DXGI_RGB e7;
+            public DXGI_RGB e8;
+            public DXGI_RGB e9;
+            public DXGI_RGB e10;
+            public DXGI_RGB e11;
+            public DXGI_RGB e12;
+            public DXGI_RGB e13;
+            public DXGI_RGB e14;
+            public DXGI_RGB e15;
+            public DXGI_RGB e16;
+            public DXGI_RGB e17;
+            public DXGI_RGB e18;
+            public DXGI_RGB e19;
+            public DXGI_RGB e20;
+            public DXGI_RGB e21;
+            public DXGI_RGB e22;
+            public DXGI_RGB e23;
+            public DXGI_RGB e24;
+            public DXGI_RGB e25;
+            public DXGI_RGB e26;
+            public DXGI_RGB e27;
+            public DXGI_RGB e28;
+            public DXGI_RGB e29;
+            public DXGI_RGB e30;
+            public DXGI_RGB e31;
+            public DXGI_RGB e32;
+            public DXGI_RGB e33;
+            public DXGI_RGB e34;
+            public DXGI_RGB e35;
+            public DXGI_RGB e36;
+            public DXGI_RGB e37;
+            public DXGI_RGB e38;
+            public DXGI_RGB e39;
+            public DXGI_RGB e40;
+            public DXGI_RGB e41;
+            public DXGI_RGB e42;
+            public DXGI_RGB e43;
+            public DXGI_RGB e44;
+            public DXGI_RGB e45;
+            public DXGI_RGB e46;
+            public DXGI_RGB e47;
+            public DXGI_RGB e48;
+            public DXGI_RGB e49;
+            public DXGI_RGB e50;
+            public DXGI_RGB e51;
+            public DXGI_RGB e52;
+            public DXGI_RGB e53;
+            public DXGI_RGB e54;
+            public DXGI_RGB e55;
+            public DXGI_RGB e56;
+            public DXGI_RGB e57;
+            public DXGI_RGB e58;
+            public DXGI_RGB e59;
+            public DXGI_RGB e60;
+            public DXGI_RGB e61;
+            public DXGI_RGB e62;
+            public DXGI_RGB e63;
+            public DXGI_RGB e64;
+            public DXGI_RGB e65;
+            public DXGI_RGB e66;
+            public DXGI_RGB e67;
+            public DXGI_RGB e68;
+            public DXGI_RGB e69;
+            public DXGI_RGB e70;
+            public DXGI_RGB e71;
+            public DXGI_RGB e72;
+            public DXGI_RGB e73;
+            public DXGI_RGB e74;
+            public DXGI_RGB e75;
+            public DXGI_RGB e76;
+            public DXGI_RGB e77;
+            public DXGI_RGB e78;
+            public DXGI_RGB e79;
+            public DXGI_RGB e80;
+            public DXGI_RGB e81;
+            public DXGI_RGB e82;
+            public DXGI_RGB e83;
+            public DXGI_RGB e84;
+            public DXGI_RGB e85;
+            public DXGI_RGB e86;
+            public DXGI_RGB e87;
+            public DXGI_RGB e88;
+            public DXGI_RGB e89;
+            public DXGI_RGB e90;
+            public DXGI_RGB e91;
+            public DXGI_RGB e92;
+            public DXGI_RGB e93;
+            public DXGI_RGB e94;
+            public DXGI_RGB e95;
+            public DXGI_RGB e96;
+            public DXGI_RGB e97;
+            public DXGI_RGB e98;
+            public DXGI_RGB e99;
+            public DXGI_RGB e100;
+            public DXGI_RGB e101;
+            public DXGI_RGB e102;
+            public DXGI_RGB e103;
+            public DXGI_RGB e104;
+            public DXGI_RGB e105;
+            public DXGI_RGB e106;
+            public DXGI_RGB e107;
+            public DXGI_RGB e108;
+            public DXGI_RGB e109;
+            public DXGI_RGB e110;
+            public DXGI_RGB e111;
+            public DXGI_RGB e112;
+            public DXGI_RGB e113;
+            public DXGI_RGB e114;
+            public DXGI_RGB e115;
+            public DXGI_RGB e116;
+            public DXGI_RGB e117;
+            public DXGI_RGB e118;
+            public DXGI_RGB e119;
+            public DXGI_RGB e120;
+            public DXGI_RGB e121;
+            public DXGI_RGB e122;
+            public DXGI_RGB e123;
+            public DXGI_RGB e124;
+            public DXGI_RGB e125;
+            public DXGI_RGB e126;
+            public DXGI_RGB e127;
+            public DXGI_RGB e128;
+            public DXGI_RGB e129;
+            public DXGI_RGB e130;
+            public DXGI_RGB e131;
+            public DXGI_RGB e132;
+            public DXGI_RGB e133;
+            public DXGI_RGB e134;
+            public DXGI_RGB e135;
+            public DXGI_RGB e136;
+            public DXGI_RGB e137;
+            public DXGI_RGB e138;
+            public DXGI_RGB e139;
+            public DXGI_RGB e140;
+            public DXGI_RGB e141;
+            public DXGI_RGB e142;
+            public DXGI_RGB e143;
+            public DXGI_RGB e144;
+            public DXGI_RGB e145;
+            public DXGI_RGB e146;
+            public DXGI_RGB e147;
+            public DXGI_RGB e148;
+            public DXGI_RGB e149;
+            public DXGI_RGB e150;
+            public DXGI_RGB e151;
+            public DXGI_RGB e152;
+            public DXGI_RGB e153;
+            public DXGI_RGB e154;
+            public DXGI_RGB e155;
+            public DXGI_RGB e156;
+            public DXGI_RGB e157;
+            public DXGI_RGB e158;
+            public DXGI_RGB e159;
+            public DXGI_RGB e160;
+            public DXGI_RGB e161;
+            public DXGI_RGB e162;
+            public DXGI_RGB e163;
+            public DXGI_RGB e164;
+            public DXGI_RGB e165;
+            public DXGI_RGB e166;
+            public DXGI_RGB e167;
+            public DXGI_RGB e168;
+            public DXGI_RGB e169;
+            public DXGI_RGB e170;
+            public DXGI_RGB e171;
+            public DXGI_RGB e172;
+            public DXGI_RGB e173;
+            public DXGI_RGB e174;
+            public DXGI_RGB e175;
+            public DXGI_RGB e176;
+            public DXGI_RGB e177;
+            public DXGI_RGB e178;
+            public DXGI_RGB e179;
+            public DXGI_RGB e180;
+            public DXGI_RGB e181;
+            public DXGI_RGB e182;
+            public DXGI_RGB e183;
+            public DXGI_RGB e184;
+            public DXGI_RGB e185;
+            public DXGI_RGB e186;
+            public DXGI_RGB e187;
+            public DXGI_RGB e188;
+            public DXGI_RGB e189;
+            public DXGI_RGB e190;
+            public DXGI_RGB e191;
+            public DXGI_RGB e192;
+            public DXGI_RGB e193;
+            public DXGI_RGB e194;
+            public DXGI_RGB e195;
+            public DXGI_RGB e196;
+            public DXGI_RGB e197;
+            public DXGI_RGB e198;
+            public DXGI_RGB e199;
+            public DXGI_RGB e200;
+            public DXGI_RGB e201;
+            public DXGI_RGB e202;
+            public DXGI_RGB e203;
+            public DXGI_RGB e204;
+            public DXGI_RGB e205;
+            public DXGI_RGB e206;
+            public DXGI_RGB e207;
+            public DXGI_RGB e208;
+            public DXGI_RGB e209;
+            public DXGI_RGB e210;
+            public DXGI_RGB e211;
+            public DXGI_RGB e212;
+            public DXGI_RGB e213;
+            public DXGI_RGB e214;
+            public DXGI_RGB e215;
+            public DXGI_RGB e216;
+            public DXGI_RGB e217;
+            public DXGI_RGB e218;
+            public DXGI_RGB e219;
+            public DXGI_RGB e220;
+            public DXGI_RGB e221;
+            public DXGI_RGB e222;
+            public DXGI_RGB e223;
+            public DXGI_RGB e224;
+            public DXGI_RGB e225;
+            public DXGI_RGB e226;
+            public DXGI_RGB e227;
+            public DXGI_RGB e228;
+            public DXGI_RGB e229;
+            public DXGI_RGB e230;
+            public DXGI_RGB e231;
+            public DXGI_RGB e232;
+            public DXGI_RGB e233;
+            public DXGI_RGB e234;
+            public DXGI_RGB e235;
+            public DXGI_RGB e236;
+            public DXGI_RGB e237;
+            public DXGI_RGB e238;
+            public DXGI_RGB e239;
+            public DXGI_RGB e240;
+            public DXGI_RGB e241;
+            public DXGI_RGB e242;
+            public DXGI_RGB e243;
+            public DXGI_RGB e244;
+            public DXGI_RGB e245;
+            public DXGI_RGB e246;
+            public DXGI_RGB e247;
+            public DXGI_RGB e248;
+            public DXGI_RGB e249;
+            public DXGI_RGB e250;
+            public DXGI_RGB e251;
+            public DXGI_RGB e252;
+            public DXGI_RGB e253;
+            public DXGI_RGB e254;
+            public DXGI_RGB e255;
+            public DXGI_RGB e256;
+            public DXGI_RGB e257;
+            public DXGI_RGB e258;
+            public DXGI_RGB e259;
+            public DXGI_RGB e260;
+            public DXGI_RGB e261;
+            public DXGI_RGB e262;
+            public DXGI_RGB e263;
+            public DXGI_RGB e264;
+            public DXGI_RGB e265;
+            public DXGI_RGB e266;
+            public DXGI_RGB e267;
+            public DXGI_RGB e268;
+            public DXGI_RGB e269;
+            public DXGI_RGB e270;
+            public DXGI_RGB e271;
+            public DXGI_RGB e272;
+            public DXGI_RGB e273;
+            public DXGI_RGB e274;
+            public DXGI_RGB e275;
+            public DXGI_RGB e276;
+            public DXGI_RGB e277;
+            public DXGI_RGB e278;
+            public DXGI_RGB e279;
+            public DXGI_RGB e280;
+            public DXGI_RGB e281;
+            public DXGI_RGB e282;
+            public DXGI_RGB e283;
+            public DXGI_RGB e284;
+            public DXGI_RGB e285;
+            public DXGI_RGB e286;
+            public DXGI_RGB e287;
+            public DXGI_RGB e288;
+            public DXGI_RGB e289;
+            public DXGI_RGB e290;
+            public DXGI_RGB e291;
+            public DXGI_RGB e292;
+            public DXGI_RGB e293;
+            public DXGI_RGB e294;
+            public DXGI_RGB e295;
+            public DXGI_RGB e296;
+            public DXGI_RGB e297;
+            public DXGI_RGB e298;
+            public DXGI_RGB e299;
+            public DXGI_RGB e300;
+            public DXGI_RGB e301;
+            public DXGI_RGB e302;
+            public DXGI_RGB e303;
+            public DXGI_RGB e304;
+            public DXGI_RGB e305;
+            public DXGI_RGB e306;
+            public DXGI_RGB e307;
+            public DXGI_RGB e308;
+            public DXGI_RGB e309;
+            public DXGI_RGB e310;
+            public DXGI_RGB e311;
+            public DXGI_RGB e312;
+            public DXGI_RGB e313;
+            public DXGI_RGB e314;
+            public DXGI_RGB e315;
+            public DXGI_RGB e316;
+            public DXGI_RGB e317;
+            public DXGI_RGB e318;
+            public DXGI_RGB e319;
+            public DXGI_RGB e320;
+            public DXGI_RGB e321;
+            public DXGI_RGB e322;
+            public DXGI_RGB e323;
+            public DXGI_RGB e324;
+            public DXGI_RGB e325;
+            public DXGI_RGB e326;
+            public DXGI_RGB e327;
+            public DXGI_RGB e328;
+            public DXGI_RGB e329;
+            public DXGI_RGB e330;
+            public DXGI_RGB e331;
+            public DXGI_RGB e332;
+            public DXGI_RGB e333;
+            public DXGI_RGB e334;
+            public DXGI_RGB e335;
+            public DXGI_RGB e336;
+            public DXGI_RGB e337;
+            public DXGI_RGB e338;
+            public DXGI_RGB e339;
+            public DXGI_RGB e340;
+            public DXGI_RGB e341;
+            public DXGI_RGB e342;
+            public DXGI_RGB e343;
+            public DXGI_RGB e344;
+            public DXGI_RGB e345;
+            public DXGI_RGB e346;
+            public DXGI_RGB e347;
+            public DXGI_RGB e348;
+            public DXGI_RGB e349;
+            public DXGI_RGB e350;
+            public DXGI_RGB e351;
+            public DXGI_RGB e352;
+            public DXGI_RGB e353;
+            public DXGI_RGB e354;
+            public DXGI_RGB e355;
+            public DXGI_RGB e356;
+            public DXGI_RGB e357;
+            public DXGI_RGB e358;
+            public DXGI_RGB e359;
+            public DXGI_RGB e360;
+            public DXGI_RGB e361;
+            public DXGI_RGB e362;
+            public DXGI_RGB e363;
+            public DXGI_RGB e364;
+            public DXGI_RGB e365;
+            public DXGI_RGB e366;
+            public DXGI_RGB e367;
+            public DXGI_RGB e368;
+            public DXGI_RGB e369;
+            public DXGI_RGB e370;
+            public DXGI_RGB e371;
+            public DXGI_RGB e372;
+            public DXGI_RGB e373;
+            public DXGI_RGB e374;
+            public DXGI_RGB e375;
+            public DXGI_RGB e376;
+            public DXGI_RGB e377;
+            public DXGI_RGB e378;
+            public DXGI_RGB e379;
+            public DXGI_RGB e380;
+            public DXGI_RGB e381;
+            public DXGI_RGB e382;
+            public DXGI_RGB e383;
+            public DXGI_RGB e384;
+            public DXGI_RGB e385;
+            public DXGI_RGB e386;
+            public DXGI_RGB e387;
+            public DXGI_RGB e388;
+            public DXGI_RGB e389;
+            public DXGI_RGB e390;
+            public DXGI_RGB e391;
+            public DXGI_RGB e392;
+            public DXGI_RGB e393;
+            public DXGI_RGB e394;
+            public DXGI_RGB e395;
+            public DXGI_RGB e396;
+            public DXGI_RGB e397;
+            public DXGI_RGB e398;
+            public DXGI_RGB e399;
+            public DXGI_RGB e400;
+            public DXGI_RGB e401;
+            public DXGI_RGB e402;
+            public DXGI_RGB e403;
+            public DXGI_RGB e404;
+            public DXGI_RGB e405;
+            public DXGI_RGB e406;
+            public DXGI_RGB e407;
+            public DXGI_RGB e408;
+            public DXGI_RGB e409;
+            public DXGI_RGB e410;
+            public DXGI_RGB e411;
+            public DXGI_RGB e412;
+            public DXGI_RGB e413;
+            public DXGI_RGB e414;
+            public DXGI_RGB e415;
+            public DXGI_RGB e416;
+            public DXGI_RGB e417;
+            public DXGI_RGB e418;
+            public DXGI_RGB e419;
+            public DXGI_RGB e420;
+            public DXGI_RGB e421;
+            public DXGI_RGB e422;
+            public DXGI_RGB e423;
+            public DXGI_RGB e424;
+            public DXGI_RGB e425;
+            public DXGI_RGB e426;
+            public DXGI_RGB e427;
+            public DXGI_RGB e428;
+            public DXGI_RGB e429;
+            public DXGI_RGB e430;
+            public DXGI_RGB e431;
+            public DXGI_RGB e432;
+            public DXGI_RGB e433;
+            public DXGI_RGB e434;
+            public DXGI_RGB e435;
+            public DXGI_RGB e436;
+            public DXGI_RGB e437;
+            public DXGI_RGB e438;
+            public DXGI_RGB e439;
+            public DXGI_RGB e440;
+            public DXGI_RGB e441;
+            public DXGI_RGB e442;
+            public DXGI_RGB e443;
+            public DXGI_RGB e444;
+            public DXGI_RGB e445;
+            public DXGI_RGB e446;
+            public DXGI_RGB e447;
+            public DXGI_RGB e448;
+            public DXGI_RGB e449;
+            public DXGI_RGB e450;
+            public DXGI_RGB e451;
+            public DXGI_RGB e452;
+            public DXGI_RGB e453;
+            public DXGI_RGB e454;
+            public DXGI_RGB e455;
+            public DXGI_RGB e456;
+            public DXGI_RGB e457;
+            public DXGI_RGB e458;
+            public DXGI_RGB e459;
+            public DXGI_RGB e460;
+            public DXGI_RGB e461;
+            public DXGI_RGB e462;
+            public DXGI_RGB e463;
+            public DXGI_RGB e464;
+            public DXGI_RGB e465;
+            public DXGI_RGB e466;
+            public DXGI_RGB e467;
+            public DXGI_RGB e468;
+            public DXGI_RGB e469;
+            public DXGI_RGB e470;
+            public DXGI_RGB e471;
+            public DXGI_RGB e472;
+            public DXGI_RGB e473;
+            public DXGI_RGB e474;
+            public DXGI_RGB e475;
+            public DXGI_RGB e476;
+            public DXGI_RGB e477;
+            public DXGI_RGB e478;
+            public DXGI_RGB e479;
+            public DXGI_RGB e480;
+            public DXGI_RGB e481;
+            public DXGI_RGB e482;
+            public DXGI_RGB e483;
+            public DXGI_RGB e484;
+            public DXGI_RGB e485;
+            public DXGI_RGB e486;
+            public DXGI_RGB e487;
+            public DXGI_RGB e488;
+            public DXGI_RGB e489;
+            public DXGI_RGB e490;
+            public DXGI_RGB e491;
+            public DXGI_RGB e492;
+            public DXGI_RGB e493;
+            public DXGI_RGB e494;
+            public DXGI_RGB e495;
+            public DXGI_RGB e496;
+            public DXGI_RGB e497;
+            public DXGI_RGB e498;
+            public DXGI_RGB e499;
+            public DXGI_RGB e500;
+            public DXGI_RGB e501;
+            public DXGI_RGB e502;
+            public DXGI_RGB e503;
+            public DXGI_RGB e504;
+            public DXGI_RGB e505;
+            public DXGI_RGB e506;
+            public DXGI_RGB e507;
+            public DXGI_RGB e508;
+            public DXGI_RGB e509;
+            public DXGI_RGB e510;
+            public DXGI_RGB e511;
+            public DXGI_RGB e512;
+            public DXGI_RGB e513;
+            public DXGI_RGB e514;
+            public DXGI_RGB e515;
+            public DXGI_RGB e516;
+            public DXGI_RGB e517;
+            public DXGI_RGB e518;
+            public DXGI_RGB e519;
+            public DXGI_RGB e520;
+            public DXGI_RGB e521;
+            public DXGI_RGB e522;
+            public DXGI_RGB e523;
+            public DXGI_RGB e524;
+            public DXGI_RGB e525;
+            public DXGI_RGB e526;
+            public DXGI_RGB e527;
+            public DXGI_RGB e528;
+            public DXGI_RGB e529;
+            public DXGI_RGB e530;
+            public DXGI_RGB e531;
+            public DXGI_RGB e532;
+            public DXGI_RGB e533;
+            public DXGI_RGB e534;
+            public DXGI_RGB e535;
+            public DXGI_RGB e536;
+            public DXGI_RGB e537;
+            public DXGI_RGB e538;
+            public DXGI_RGB e539;
+            public DXGI_RGB e540;
+            public DXGI_RGB e541;
+            public DXGI_RGB e542;
+            public DXGI_RGB e543;
+            public DXGI_RGB e544;
+            public DXGI_RGB e545;
+            public DXGI_RGB e546;
+            public DXGI_RGB e547;
+            public DXGI_RGB e548;
+            public DXGI_RGB e549;
+            public DXGI_RGB e550;
+            public DXGI_RGB e551;
+            public DXGI_RGB e552;
+            public DXGI_RGB e553;
+            public DXGI_RGB e554;
+            public DXGI_RGB e555;
+            public DXGI_RGB e556;
+            public DXGI_RGB e557;
+            public DXGI_RGB e558;
+            public DXGI_RGB e559;
+            public DXGI_RGB e560;
+            public DXGI_RGB e561;
+            public DXGI_RGB e562;
+            public DXGI_RGB e563;
+            public DXGI_RGB e564;
+            public DXGI_RGB e565;
+            public DXGI_RGB e566;
+            public DXGI_RGB e567;
+            public DXGI_RGB e568;
+            public DXGI_RGB e569;
+            public DXGI_RGB e570;
+            public DXGI_RGB e571;
+            public DXGI_RGB e572;
+            public DXGI_RGB e573;
+            public DXGI_RGB e574;
+            public DXGI_RGB e575;
+            public DXGI_RGB e576;
+            public DXGI_RGB e577;
+            public DXGI_RGB e578;
+            public DXGI_RGB e579;
+            public DXGI_RGB e580;
+            public DXGI_RGB e581;
+            public DXGI_RGB e582;
+            public DXGI_RGB e583;
+            public DXGI_RGB e584;
+            public DXGI_RGB e585;
+            public DXGI_RGB e586;
+            public DXGI_RGB e587;
+            public DXGI_RGB e588;
+            public DXGI_RGB e589;
+            public DXGI_RGB e590;
+            public DXGI_RGB e591;
+            public DXGI_RGB e592;
+            public DXGI_RGB e593;
+            public DXGI_RGB e594;
+            public DXGI_RGB e595;
+            public DXGI_RGB e596;
+            public DXGI_RGB e597;
+            public DXGI_RGB e598;
+            public DXGI_RGB e599;
+            public DXGI_RGB e600;
+            public DXGI_RGB e601;
+            public DXGI_RGB e602;
+            public DXGI_RGB e603;
+            public DXGI_RGB e604;
+            public DXGI_RGB e605;
+            public DXGI_RGB e606;
+            public DXGI_RGB e607;
+            public DXGI_RGB e608;
+            public DXGI_RGB e609;
+            public DXGI_RGB e610;
+            public DXGI_RGB e611;
+            public DXGI_RGB e612;
+            public DXGI_RGB e613;
+            public DXGI_RGB e614;
+            public DXGI_RGB e615;
+            public DXGI_RGB e616;
+            public DXGI_RGB e617;
+            public DXGI_RGB e618;
+            public DXGI_RGB e619;
+            public DXGI_RGB e620;
+            public DXGI_RGB e621;
+            public DXGI_RGB e622;
+            public DXGI_RGB e623;
+            public DXGI_RGB e624;
+            public DXGI_RGB e625;
+            public DXGI_RGB e626;
+            public DXGI_RGB e627;
+            public DXGI_RGB e628;
+            public DXGI_RGB e629;
+            public DXGI_RGB e630;
+            public DXGI_RGB e631;
+            public DXGI_RGB e632;
+            public DXGI_RGB e633;
+            public DXGI_RGB e634;
+            public DXGI_RGB e635;
+            public DXGI_RGB e636;
+            public DXGI_RGB e637;
+            public DXGI_RGB e638;
+            public DXGI_RGB e639;
+            public DXGI_RGB e640;
+            public DXGI_RGB e641;
+            public DXGI_RGB e642;
+            public DXGI_RGB e643;
+            public DXGI_RGB e644;
+            public DXGI_RGB e645;
+            public DXGI_RGB e646;
+            public DXGI_RGB e647;
+            public DXGI_RGB e648;
+            public DXGI_RGB e649;
+            public DXGI_RGB e650;
+            public DXGI_RGB e651;
+            public DXGI_RGB e652;
+            public DXGI_RGB e653;
+            public DXGI_RGB e654;
+            public DXGI_RGB e655;
+            public DXGI_RGB e656;
+            public DXGI_RGB e657;
+            public DXGI_RGB e658;
+            public DXGI_RGB e659;
+            public DXGI_RGB e660;
+            public DXGI_RGB e661;
+            public DXGI_RGB e662;
+            public DXGI_RGB e663;
+            public DXGI_RGB e664;
+            public DXGI_RGB e665;
+            public DXGI_RGB e666;
+            public DXGI_RGB e667;
+            public DXGI_RGB e668;
+            public DXGI_RGB e669;
+            public DXGI_RGB e670;
+            public DXGI_RGB e671;
+            public DXGI_RGB e672;
+            public DXGI_RGB e673;
+            public DXGI_RGB e674;
+            public DXGI_RGB e675;
+            public DXGI_RGB e676;
+            public DXGI_RGB e677;
+            public DXGI_RGB e678;
+            public DXGI_RGB e679;
+            public DXGI_RGB e680;
+            public DXGI_RGB e681;
+            public DXGI_RGB e682;
+            public DXGI_RGB e683;
+            public DXGI_RGB e684;
+            public DXGI_RGB e685;
+            public DXGI_RGB e686;
+            public DXGI_RGB e687;
+            public DXGI_RGB e688;
+            public DXGI_RGB e689;
+            public DXGI_RGB e690;
+            public DXGI_RGB e691;
+            public DXGI_RGB e692;
+            public DXGI_RGB e693;
+            public DXGI_RGB e694;
+            public DXGI_RGB e695;
+            public DXGI_RGB e696;
+            public DXGI_RGB e697;
+            public DXGI_RGB e698;
+            public DXGI_RGB e699;
+            public DXGI_RGB e700;
+            public DXGI_RGB e701;
+            public DXGI_RGB e702;
+            public DXGI_RGB e703;
+            public DXGI_RGB e704;
+            public DXGI_RGB e705;
+            public DXGI_RGB e706;
+            public DXGI_RGB e707;
+            public DXGI_RGB e708;
+            public DXGI_RGB e709;
+            public DXGI_RGB e710;
+            public DXGI_RGB e711;
+            public DXGI_RGB e712;
+            public DXGI_RGB e713;
+            public DXGI_RGB e714;
+            public DXGI_RGB e715;
+            public DXGI_RGB e716;
+            public DXGI_RGB e717;
+            public DXGI_RGB e718;
+            public DXGI_RGB e719;
+            public DXGI_RGB e720;
+            public DXGI_RGB e721;
+            public DXGI_RGB e722;
+            public DXGI_RGB e723;
+            public DXGI_RGB e724;
+            public DXGI_RGB e725;
+            public DXGI_RGB e726;
+            public DXGI_RGB e727;
+            public DXGI_RGB e728;
+            public DXGI_RGB e729;
+            public DXGI_RGB e730;
+            public DXGI_RGB e731;
+            public DXGI_RGB e732;
+            public DXGI_RGB e733;
+            public DXGI_RGB e734;
+            public DXGI_RGB e735;
+            public DXGI_RGB e736;
+            public DXGI_RGB e737;
+            public DXGI_RGB e738;
+            public DXGI_RGB e739;
+            public DXGI_RGB e740;
+            public DXGI_RGB e741;
+            public DXGI_RGB e742;
+            public DXGI_RGB e743;
+            public DXGI_RGB e744;
+            public DXGI_RGB e745;
+            public DXGI_RGB e746;
+            public DXGI_RGB e747;
+            public DXGI_RGB e748;
+            public DXGI_RGB e749;
+            public DXGI_RGB e750;
+            public DXGI_RGB e751;
+            public DXGI_RGB e752;
+            public DXGI_RGB e753;
+            public DXGI_RGB e754;
+            public DXGI_RGB e755;
+            public DXGI_RGB e756;
+            public DXGI_RGB e757;
+            public DXGI_RGB e758;
+            public DXGI_RGB e759;
+            public DXGI_RGB e760;
+            public DXGI_RGB e761;
+            public DXGI_RGB e762;
+            public DXGI_RGB e763;
+            public DXGI_RGB e764;
+            public DXGI_RGB e765;
+            public DXGI_RGB e766;
+            public DXGI_RGB e767;
+            public DXGI_RGB e768;
+            public DXGI_RGB e769;
+            public DXGI_RGB e770;
+            public DXGI_RGB e771;
+            public DXGI_RGB e772;
+            public DXGI_RGB e773;
+            public DXGI_RGB e774;
+            public DXGI_RGB e775;
+            public DXGI_RGB e776;
+            public DXGI_RGB e777;
+            public DXGI_RGB e778;
+            public DXGI_RGB e779;
+            public DXGI_RGB e780;
+            public DXGI_RGB e781;
+            public DXGI_RGB e782;
+            public DXGI_RGB e783;
+            public DXGI_RGB e784;
+            public DXGI_RGB e785;
+            public DXGI_RGB e786;
+            public DXGI_RGB e787;
+            public DXGI_RGB e788;
+            public DXGI_RGB e789;
+            public DXGI_RGB e790;
+            public DXGI_RGB e791;
+            public DXGI_RGB e792;
+            public DXGI_RGB e793;
+            public DXGI_RGB e794;
+            public DXGI_RGB e795;
+            public DXGI_RGB e796;
+            public DXGI_RGB e797;
+            public DXGI_RGB e798;
+            public DXGI_RGB e799;
+            public DXGI_RGB e800;
+            public DXGI_RGB e801;
+            public DXGI_RGB e802;
+            public DXGI_RGB e803;
+            public DXGI_RGB e804;
+            public DXGI_RGB e805;
+            public DXGI_RGB e806;
+            public DXGI_RGB e807;
+            public DXGI_RGB e808;
+            public DXGI_RGB e809;
+            public DXGI_RGB e810;
+            public DXGI_RGB e811;
+            public DXGI_RGB e812;
+            public DXGI_RGB e813;
+            public DXGI_RGB e814;
+            public DXGI_RGB e815;
+            public DXGI_RGB e816;
+            public DXGI_RGB e817;
+            public DXGI_RGB e818;
+            public DXGI_RGB e819;
+            public DXGI_RGB e820;
+            public DXGI_RGB e821;
+            public DXGI_RGB e822;
+            public DXGI_RGB e823;
+            public DXGI_RGB e824;
+            public DXGI_RGB e825;
+            public DXGI_RGB e826;
+            public DXGI_RGB e827;
+            public DXGI_RGB e828;
+            public DXGI_RGB e829;
+            public DXGI_RGB e830;
+            public DXGI_RGB e831;
+            public DXGI_RGB e832;
+            public DXGI_RGB e833;
+            public DXGI_RGB e834;
+            public DXGI_RGB e835;
+            public DXGI_RGB e836;
+            public DXGI_RGB e837;
+            public DXGI_RGB e838;
+            public DXGI_RGB e839;
+            public DXGI_RGB e840;
+            public DXGI_RGB e841;
+            public DXGI_RGB e842;
+            public DXGI_RGB e843;
+            public DXGI_RGB e844;
+            public DXGI_RGB e845;
+            public DXGI_RGB e846;
+            public DXGI_RGB e847;
+            public DXGI_RGB e848;
+            public DXGI_RGB e849;
+            public DXGI_RGB e850;
+            public DXGI_RGB e851;
+            public DXGI_RGB e852;
+            public DXGI_RGB e853;
+            public DXGI_RGB e854;
+            public DXGI_RGB e855;
+            public DXGI_RGB e856;
+            public DXGI_RGB e857;
+            public DXGI_RGB e858;
+            public DXGI_RGB e859;
+            public DXGI_RGB e860;
+            public DXGI_RGB e861;
+            public DXGI_RGB e862;
+            public DXGI_RGB e863;
+            public DXGI_RGB e864;
+            public DXGI_RGB e865;
+            public DXGI_RGB e866;
+            public DXGI_RGB e867;
+            public DXGI_RGB e868;
+            public DXGI_RGB e869;
+            public DXGI_RGB e870;
+            public DXGI_RGB e871;
+            public DXGI_RGB e872;
+            public DXGI_RGB e873;
+            public DXGI_RGB e874;
+            public DXGI_RGB e875;
+            public DXGI_RGB e876;
+            public DXGI_RGB e877;
+            public DXGI_RGB e878;
+            public DXGI_RGB e879;
+            public DXGI_RGB e880;
+            public DXGI_RGB e881;
+            public DXGI_RGB e882;
+            public DXGI_RGB e883;
+            public DXGI_RGB e884;
+            public DXGI_RGB e885;
+            public DXGI_RGB e886;
+            public DXGI_RGB e887;
+            public DXGI_RGB e888;
+            public DXGI_RGB e889;
+            public DXGI_RGB e890;
+            public DXGI_RGB e891;
+            public DXGI_RGB e892;
+            public DXGI_RGB e893;
+            public DXGI_RGB e894;
+            public DXGI_RGB e895;
+            public DXGI_RGB e896;
+            public DXGI_RGB e897;
+            public DXGI_RGB e898;
+            public DXGI_RGB e899;
+            public DXGI_RGB e900;
+            public DXGI_RGB e901;
+            public DXGI_RGB e902;
+            public DXGI_RGB e903;
+            public DXGI_RGB e904;
+            public DXGI_RGB e905;
+            public DXGI_RGB e906;
+            public DXGI_RGB e907;
+            public DXGI_RGB e908;
+            public DXGI_RGB e909;
+            public DXGI_RGB e910;
+            public DXGI_RGB e911;
+            public DXGI_RGB e912;
+            public DXGI_RGB e913;
+            public DXGI_RGB e914;
+            public DXGI_RGB e915;
+            public DXGI_RGB e916;
+            public DXGI_RGB e917;
+            public DXGI_RGB e918;
+            public DXGI_RGB e919;
+            public DXGI_RGB e920;
+            public DXGI_RGB e921;
+            public DXGI_RGB e922;
+            public DXGI_RGB e923;
+            public DXGI_RGB e924;
+            public DXGI_RGB e925;
+            public DXGI_RGB e926;
+            public DXGI_RGB e927;
+            public DXGI_RGB e928;
+            public DXGI_RGB e929;
+            public DXGI_RGB e930;
+            public DXGI_RGB e931;
+            public DXGI_RGB e932;
+            public DXGI_RGB e933;
+            public DXGI_RGB e934;
+            public DXGI_RGB e935;
+            public DXGI_RGB e936;
+            public DXGI_RGB e937;
+            public DXGI_RGB e938;
+            public DXGI_RGB e939;
+            public DXGI_RGB e940;
+            public DXGI_RGB e941;
+            public DXGI_RGB e942;
+            public DXGI_RGB e943;
+            public DXGI_RGB e944;
+            public DXGI_RGB e945;
+            public DXGI_RGB e946;
+            public DXGI_RGB e947;
+            public DXGI_RGB e948;
+            public DXGI_RGB e949;
+            public DXGI_RGB e950;
+            public DXGI_RGB e951;
+            public DXGI_RGB e952;
+            public DXGI_RGB e953;
+            public DXGI_RGB e954;
+            public DXGI_RGB e955;
+            public DXGI_RGB e956;
+            public DXGI_RGB e957;
+            public DXGI_RGB e958;
+            public DXGI_RGB e959;
+            public DXGI_RGB e960;
+            public DXGI_RGB e961;
+            public DXGI_RGB e962;
+            public DXGI_RGB e963;
+            public DXGI_RGB e964;
+            public DXGI_RGB e965;
+            public DXGI_RGB e966;
+            public DXGI_RGB e967;
+            public DXGI_RGB e968;
+            public DXGI_RGB e969;
+            public DXGI_RGB e970;
+            public DXGI_RGB e971;
+            public DXGI_RGB e972;
+            public DXGI_RGB e973;
+            public DXGI_RGB e974;
+            public DXGI_RGB e975;
+            public DXGI_RGB e976;
+            public DXGI_RGB e977;
+            public DXGI_RGB e978;
+            public DXGI_RGB e979;
+            public DXGI_RGB e980;
+            public DXGI_RGB e981;
+            public DXGI_RGB e982;
+            public DXGI_RGB e983;
+            public DXGI_RGB e984;
+            public DXGI_RGB e985;
+            public DXGI_RGB e986;
+            public DXGI_RGB e987;
+            public DXGI_RGB e988;
+            public DXGI_RGB e989;
+            public DXGI_RGB e990;
+            public DXGI_RGB e991;
+            public DXGI_RGB e992;
+            public DXGI_RGB e993;
+            public DXGI_RGB e994;
+            public DXGI_RGB e995;
+            public DXGI_RGB e996;
+            public DXGI_RGB e997;
+            public DXGI_RGB e998;
+            public DXGI_RGB e999;
+            public DXGI_RGB e1000;
+            public DXGI_RGB e1001;
+            public DXGI_RGB e1002;
+            public DXGI_RGB e1003;
+            public DXGI_RGB e1004;
+            public DXGI_RGB e1005;
+            public DXGI_RGB e1006;
+            public DXGI_RGB e1007;
+            public DXGI_RGB e1008;
+            public DXGI_RGB e1009;
+            public DXGI_RGB e1010;
+            public DXGI_RGB e1011;
+            public DXGI_RGB e1012;
+            public DXGI_RGB e1013;
+            public DXGI_RGB e1014;
+            public DXGI_RGB e1015;
+            public DXGI_RGB e1016;
+            public DXGI_RGB e1017;
+            public DXGI_RGB e1018;
+            public DXGI_RGB e1019;
+            public DXGI_RGB e1020;
+            public DXGI_RGB e1021;
+            public DXGI_RGB e1022;
+            public DXGI_RGB e1023;
+            public DXGI_RGB e1024;
+#if NET6_0_OR_GREATER
+            public ref DXGI_RGB this[int index]
+            {
+                [MethodImpl(MethodImplOptions.AggressiveInlining)]
+                get
+                {
+                    return ref AsSpan()[index];
+                }
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Span<DXGI_RGB> AsSpan() => MemoryMarshal.CreateSpan(ref e0, 1025);
+#else
+            // there is no way to do this outside of terrible unsafe code. Don't do this in .Net Standard 2.0 
+
+            public DXGI_RGB this[int index]
+            {
+                get
+                {
+                    if ((uint)index > 1025)
+                        throw new ArgumentOutOfRangeException("index");
+
+                    fixed (DXGI_RGB* basePtr = &e0)
+                    {
+                        DXGI_RGB* newPtr = basePtr + index;
+                        return *newPtr;
+                    }
+                }
+                set
+                {
+                    if ((uint)index > 1025)
+                        throw new ArgumentOutOfRangeException("index");
+
+                    fixed (DXGI_RGB* basePtr = &e0)
+                    {
+                        DXGI_RGB* newPtr = basePtr + index;
+                        *newPtr = value;
+                    }
+                }
+            }
+#endif
+        }
+    }
+
+    internal unsafe struct DEVMODEW
+    {
+        public fixed ushort dmDeviceName[32];
+        public short dmSpecVersion;
+        public short dmDriverVersion;
+        public short dmSize;
+        public short dmDriverExtra;
+        public int dmFields;
+        public short dmOrientation;
+        public short dmPaperSize;
+        public short dmPaperLength;
+        public short dmPaperWidth;
+        public short dmScale;
+        public short dmCopies;
+        public short dmDefaultSource;
+        public short dmPrintQuality;
+        public short dmColor;
+        public short dmDuplex;
+        public short dmYResolution;
+        public short dmTTOption;
+        public short dmCollate;
+        public fixed ushort dmFormName[32];
+        public short dmUnusedPadding;
+        public short dmBitsPerPel;
+        public int dmPelsWidth;
+        public int dmPelsHeight;
+        public int dmDisplayFlags;
+        public int dmDisplayFrequency;
+    }
+
+    internal unsafe struct DXGI_ADAPTER_DESC
+    {
+        public fixed ushort Description[128];
+
+        public uint VendorId;
+
+        public uint DeviceId;
+
+        public uint SubSysId;
+
+        public uint Revision;
+
+        public nuint DedicatedVideoMemory;
+
+        public nuint DedicatedSystemMemory;
+
+        public nuint SharedSystemMemory;
+
+        public ulong AdapterLuid;
+    }
+
+    internal unsafe struct DXGI_ADAPTER_DESC1
+    {
+        public fixed ushort Description[128];
+
+        public uint VendorId;
+
+        public uint DeviceId;
+
+        public uint SubSysId;
+
+        public uint Revision;
+
+        public nuint DedicatedVideoMemory;
+
+        public nuint DedicatedSystemMemory;
+
+        public nuint SharedSystemMemory;
+
+        public ulong AdapterLuid;
+
+        public uint Flags;
+    }
+
+    internal unsafe struct DXGI_FRAME_STATISTICS
+    {
+        public uint PresentCount;
+
+        public uint PresentRefreshCount;
+
+        public uint SyncRefreshCount;
+
+        public ulong SyncQPCTime;
+
+        public ulong SyncGPUTime;
+    }
+
+    internal unsafe struct DXGI_GAMMA_CONTROL_CAPABILITIES
+    {
+        public int ScaleAndOffsetSupported;
+
+        public float MaxConvertedValue;
+
+        public float MinConvertedValue;
+
+        public uint NumGammaControlPoints;
+
+        public fixed float ControlPointPositions[1025];
+    }
+
+    internal unsafe struct DXGI_MAPPED_RECT
+    {
+        public int Pitch;
+
+        public byte* pBits;
+    }
+
+    internal unsafe partial struct DXGI_MODE_DESC
+    {
+        public ushort Width;
+        public ushort Height;
+        public DXGI_RATIONAL RefreshRate;
+        public DXGI_FORMAT Format;
+        public DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
+        public DXGI_MODE_SCALING Scaling;
+    }
+
+    internal unsafe partial struct DXGI_OUTPUT_DESC
+    {
+        internal fixed ushort DeviceName[32];
+
+        internal RECT DesktopCoordinates;
+
+        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;
+
+        internal HANDLE Monitor;
+    }
+
+    internal unsafe struct DXGI_PRESENT_PARAMETERS
+    {
+        public uint DirtyRectsCount;
+
+        public RECT* pDirtyRects;
+
+        public RECT* pScrollRect;
+
+        public POINT* pScrollOffset;
+    }
+
+    internal unsafe partial struct DXGI_RATIONAL
+    {
+        public ushort Numerator;
+        public ushort Denominator;
+    }
+
+    internal partial struct DXGI_RGB
+    {
+        public float Red;
+
+        public float Green;
+
+        public float Blue;
+    }
+
+    internal partial struct DXGI_RGBA
+    {
+        public float r;
+
+        public float g;
+
+        public float b;
+
+        public float a;
+    }
+
+    internal struct DXGI_SAMPLE_DESC
+    {
+        public uint Count;
+        public uint Quality;
+    }
+
+    internal unsafe struct DXGI_SURFACE_DESC
+    {
+        public uint Width;
+
+        public uint Height;
+
+        public DXGI_FORMAT Format;
+
+        public DXGI_SAMPLE_DESC SampleDesc;
+    }
+
+    internal unsafe partial struct DXGI_SWAP_CHAIN_DESC
+    {
+        public DXGI_MODE_DESC BufferDesc;
+        public DXGI_SAMPLE_DESC SampleDesc;
+        public uint BufferUsage;
+        public ushort BufferCount;
+        public IntPtr OutputWindow;
+        public int Windowed;
+        public DXGI_SWAP_EFFECT SwapEffect;
+        public ushort Flags;
+    }
+
+    internal struct DXGI_SWAP_CHAIN_DESC1
+    {
+        public uint Width;
+        public uint Height;
+        public DXGI_FORMAT Format;
+        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;
+        public DXGI_SCALING Scaling;
+        public DXGI_SWAP_EFFECT SwapEffect;
+        public DXGI_ALPHA_MODE AlphaMode;
+        public uint Flags;
+    }
+
+    internal unsafe struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC
+    {
+        public DXGI_RATIONAL RefreshRate;
+
+        public DXGI_MODE_SCANLINE_ORDER ScanlineOrdering;
+
+        public DXGI_MODE_SCALING Scaling;
+
+        public int Windowed;
+    }
+
+    internal partial struct D3D11_TEXTURE2D_DESC
+    {
+        public uint Width;
+
+        public uint Height;
+
+        public uint MipLevels;
+
+        public uint ArraySize;
+
+        public DXGI_FORMAT Format;
+
+        public DXGI_SAMPLE_DESC SampleDesc;
+
+        public D3D11_USAGE Usage;
+
+        public uint BindFlags;
+
+        public uint CPUAccessFlags;
+
+        public uint MiscFlags;
+    }
+#nullable restore
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/DirectXUnmanagedMethods.cs b/src/Windows/Avalonia.Win32/DirectX/DirectXUnmanagedMethods.cs
new file mode 100644
index 0000000000..1a739ce3d1
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DirectXUnmanagedMethods.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+    internal unsafe class DirectXUnmanagedMethods
+    {
+        // these return HRESULTs expecting Marshall to throw Win32 exceptions on failures
+        [DllImport("dxgi", ExactSpelling = true, PreserveSig = false)]
+        internal static extern void CreateDXGIFactory(ref Guid riid, out void* ppFactory);
+
+        // these return HRESULTs expecting Marshall to throw Win32 exceptions on failures
+        [DllImport("dxgi", ExactSpelling = true, PreserveSig = false)]
+        internal static extern void CreateDXGIFactory1(ref Guid riid, out void* ppFactory);
+
+        [DllImport("user32", ExactSpelling = true)]
+        internal static extern bool GetMonitorInfoW(HANDLE hMonitor, IntPtr lpmi);
+
+        [DllImport("user32", ExactSpelling = true)]
+        internal static extern bool EnumDisplaySettingsW(ushort* lpszDeviceName, uint iModeNum, DEVMODEW* lpDevMode);
+
+        [DllImport("user32", ExactSpelling = true, SetLastError = true)]
+        internal static extern bool GetClientRect(IntPtr hWnd, Interop.UnmanagedMethods.RECT* lpRect);
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs
new file mode 100644
index 0000000000..8c13ecdcc1
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiConnection.cs
@@ -0,0 +1,202 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Logging;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.Rendering;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+using static Avalonia.Win32.DxgiSwapchain.DirectXUnmanagedMethods;
+using MicroCom.Runtime;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+#pragma warning disable CA1416 // This should only be reachable on Windows
+#nullable enable
+    public unsafe class DxgiConnection : IRenderTimer
+    {
+        public const uint ENUM_CURRENT_SETTINGS = unchecked((uint)(-1));
+
+        public bool RunsInBackground => true;
+
+        public event Action<TimeSpan>? Tick;
+
+        private AngleWin32EglDisplay _angle;
+        private EglPlatformOpenGlInterface _gl;
+        private object _syncLock;
+
+        private IDXGIOutput? _output = null;
+
+        private Stopwatch? _stopwatch = null;
+
+        public DxgiConnection(EglPlatformOpenGlInterface gl, object syncLock)
+        {
+
+            _syncLock = syncLock;
+            _angle = (AngleWin32EglDisplay)gl.Display;
+            _gl = gl;
+        }
+
+        public EglPlatformOpenGlInterface Egl => _gl;
+
+        public static void TryCreateAndRegister(EglPlatformOpenGlInterface angle)
+        {
+            try
+            {
+                TryCreateAndRegisterCore(angle);
+            }
+            catch (Exception ex)
+            {
+                Logger.TryGet(LogEventLevel.Error, nameof(DxgiSwapchain))
+                    ?.Log(null, "Unable to establish Dxgi: {0}", ex);
+            }
+        }
+
+        private unsafe void RunLoop()
+        {
+            _stopwatch = System.Diagnostics.Stopwatch.StartNew();
+            try
+            {
+                GetBestOutputToVWaitOn();
+            }
+            catch (Exception ex)
+            {
+                Logger.TryGet(LogEventLevel.Error, nameof(DxgiSwapchain))
+                                    ?.Log(this, $"Failed to wait for vblank, Exception: {ex.Message}, HRESULT = {ex.HResult}");
+            }
+
+            while (true)
+            {
+                try
+                {
+                    lock (_syncLock)
+                    {
+                        if (_output is not null)
+                        {
+                            try
+                            {
+                                _output.WaitForVBlank();
+                            }
+                            catch (Exception ex)
+                            {
+                                Logger.TryGet(LogEventLevel.Error, nameof(DxgiSwapchain))
+                                    ?.Log(this, $"Failed to wait for vblank, Exception: {ex.Message}, HRESULT = {ex.HResult}");
+                                _output.Dispose();
+                                _output = null;
+                                GetBestOutputToVWaitOn();
+                            }
+                        }
+                        else
+                        {
+                            // well since that obviously didn't work, then let's use the lowest-common-denominator instead 
+                            // for reference, this has never happened on my machine,
+                            // but theoretically someone could have a weirder setup out there 
+                            DwmFlush();
+                        }
+                        Tick?.Invoke(_stopwatch.Elapsed);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.TryGet(LogEventLevel.Error, nameof(DxgiSwapchain))
+                                    ?.Log(this, $"Failed to wait for vblank, Exception: {ex.Message}, HRESULT = {ex.HResult}");
+                }
+            }
+        }
+
+        // Note: Defining best as display with highest refresh rate on 
+        private void GetBestOutputToVWaitOn()
+        {
+            double highestRefreshRate = 0.0d;
+
+            // IDXGIFactory Guid: [Guid("7B7166EC-21C7-44AE-B21A-C9AE321AE369")]
+            Guid factoryGuid = MicroComRuntime.GetGuidFor(typeof(IDXGIFactory));
+            CreateDXGIFactory(ref factoryGuid, out var factPointer);
+
+            using var fact = MicroComRuntime.CreateProxyFor<IDXGIFactory>(factPointer, true);
+
+            void* adapterPointer = null;
+
+            ushort adapterIndex = 0;
+
+            // this looks odd, but that's just how one enumerates adapters in DXGI 
+            while (fact.EnumAdapters(adapterIndex, &adapterPointer) == 0)
+            {
+                using var adapter = MicroComRuntime.CreateProxyFor<IDXGIAdapter>(adapterPointer, true);
+                void* outputPointer = null;
+                ushort outputIndex = 0;
+                while (adapter.EnumOutputs(outputIndex, &outputPointer) == 0)
+                {
+                    using var output = MicroComRuntime.CreateProxyFor<IDXGIOutput>(outputPointer, true);
+                    DXGI_OUTPUT_DESC outputDesc = output.Desc;
+
+
+                    // this handle need not closing, by the way. 
+                    HANDLE monitorH = outputDesc.Monitor;
+                    MONITORINFOEXW monInfo = default;
+                    // by setting cbSize we tell Windows to fully populate the extended info 
+
+                    monInfo.Base.cbSize = sizeof(MONITORINFOEXW);
+                    GetMonitorInfoW(monitorH, (IntPtr)(&monInfo));
+
+                    DEVMODEW devMode = default;
+                    EnumDisplaySettingsW(outputDesc.DeviceName, ENUM_CURRENT_SETTINGS, &devMode);
+
+                    if (highestRefreshRate < devMode.dmDisplayFrequency)
+                    {
+                        // ooh I like this output! 
+                        if (_output is not null)
+                        {
+                            _output.Dispose();
+                            _output = null;
+                        }
+                        _output = MicroComRuntime.CloneReference(output);
+                        highestRefreshRate = devMode.dmDisplayFrequency;
+                    }
+                    // and then increment index to move onto the next monitor 
+                    outputIndex++;
+                }
+                // and then increment index to move onto the next display adapater
+                adapterIndex++;
+            }
+
+        }
+
+        // Used the windows composition as a blueprint for this startup/creation 
+        static private bool TryCreateAndRegisterCore(EglPlatformOpenGlInterface gl)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+            var pumpLock = new object();
+            var thread = new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    DxgiConnection connection;
+
+                    connection = new DxgiConnection(gl, pumpLock);
+
+                    AvaloniaLocator.CurrentMutable.BindToSelf(connection);
+                    AvaloniaLocator.CurrentMutable.Bind<IRenderTimer>().ToConstant(connection);
+                    tcs.SetResult(true);
+                    connection.RunLoop();
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            });
+            thread.IsBackground = true;
+            thread.SetApartmentState(System.Threading.ApartmentState.STA);
+            thread.Start();
+            // block until 
+            return tcs.Task.Result;
+        }
+    }
+#nullable restore
+#pragma warning restore CA1416 // Validate platform compatibility
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs
new file mode 100644
index 0000000000..2ab9b30d43
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiRenderTarget.cs
@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+using MicroCom.Runtime;
+using static Avalonia.OpenGL.Egl.EglGlPlatformSurfaceBase;
+using static Avalonia.Win32.Interop.UnmanagedMethods;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+#pragma warning disable CA1416 // Validate platform compatibility, if you enter this not on windows you have messed up badly 
+#nullable enable
+    public unsafe class DxgiRenderTarget : EglPlatformSurfaceRenderTargetBase
+    {
+        // DXGI_FORMAT_B8G8R8A8_UNORM is target texture format as per ANGLE documentation 
+
+        public const uint DXGI_USAGE_RENDER_TARGET_OUTPUT = 0x00000020U;
+
+        private IEglWindowGlPlatformSurfaceInfo _window;
+        private EglPlatformOpenGlInterface _egl;
+        private DxgiConnection _connection;
+        private IDXGIDevice? _dxgiDevice = null;
+        private IDXGIFactory2? _dxgiFactory = null;
+        private IDXGISwapChain1? _swapChain = null;
+        private IUnknown? _renderTexture = null;
+
+        private Interop.UnmanagedMethods.RECT _clientRect = default;
+
+        private uint _flagsUsed;
+
+        private Guid ID3D11Texture2DGuid = Guid.Parse("6F15AAF2-D208-4E89-9AB4-489535D34F9C");
+
+        public DxgiRenderTarget(IEglWindowGlPlatformSurfaceInfo window, EglPlatformOpenGlInterface egl, DxgiConnection connection) : base(egl)
+        {
+            _window = window;
+            _egl = egl;
+            _connection = connection;
+
+            // the D3D device is expected to at least be an ID3D11Device 
+            // but how do I wrap an IntPtr as a managed IUnknown now? Like this. 
+            IUnknown pdevice = MicroComRuntime.CreateProxyFor<IUnknown>(((AngleWin32EglDisplay)_egl.Display).GetDirect3DDevice(), false);
+
+            _dxgiDevice = pdevice.QueryInterface<IDXGIDevice>();
+
+            // only needing the adapter pointer to ask it for the IDXGI Factory 
+            using (var adapterPointer = _dxgiDevice.Adapter)
+            {
+                Guid factoryGuid = MicroComRuntime.GetGuidFor(typeof(IDXGIFactory2));
+                _dxgiFactory = MicroComRuntime.CreateProxyFor<IDXGIFactory2>(adapterPointer.GetParent(&factoryGuid), true);
+            }
+
+            DXGI_SWAP_CHAIN_DESC1 dxgiSwapChainDesc = new DXGI_SWAP_CHAIN_DESC1();
+
+            // standard swap chain really. 
+            dxgiSwapChainDesc.Format = DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM;
+            dxgiSwapChainDesc.SampleDesc.Count = 1U;
+            dxgiSwapChainDesc.SampleDesc.Quality = 0U;
+            dxgiSwapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+            dxgiSwapChainDesc.AlphaMode = DXGI_ALPHA_MODE.DXGI_ALPHA_MODE_IGNORE;
+            dxgiSwapChainDesc.Width = (uint)_window.Size.Width;
+            dxgiSwapChainDesc.Height = (uint)_window.Size.Height;
+            dxgiSwapChainDesc.BufferCount = 2U;
+            dxgiSwapChainDesc.SwapEffect = DXGI_SWAP_EFFECT.DXGI_SWAP_EFFECT_FLIP_DISCARD;
+
+            // okay I know this looks bad, but we're hitting our render-calls by awaiting via dxgi 
+            // this is done in the DxgiConnection itself 
+            _flagsUsed = dxgiSwapChainDesc.Flags = (uint)(DXGI_SWAP_CHAIN_FLAG.DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING);
+
+            _swapChain = _dxgiFactory.CreateSwapChainForHwnd
+            (
+                    _dxgiDevice,
+                    window.Handle,
+                    &dxgiSwapChainDesc,
+                    null,
+                    null
+            );
+
+            Interop.UnmanagedMethods.RECT pClientRect;
+            GetClientRect(_window.Handle, out pClientRect);
+            _clientRect = pClientRect;
+        }
+
+        public override IGlPlatformSurfaceRenderingSession BeginDraw()
+        {
+            if (_swapChain is null)
+            {
+                throw new InvalidOperationException("No chain to draw on");
+            }
+
+            var contextLock = _egl.PrimaryContext.EnsureCurrent();
+            EglSurface? surface = null;
+            IDisposable? transaction = null;
+            var success = false;
+            try
+            {
+                Interop.UnmanagedMethods.RECT pClientRect;
+                GetClientRect(_window.Handle, out pClientRect);
+                if (!RectsEqual(pClientRect, _clientRect))
+                {
+                    // we gotta resize 
+                    _clientRect = pClientRect;
+
+                    if (_renderTexture is not null)
+                    {
+                        _renderTexture.Dispose();
+                        _renderTexture = null;
+                    }
+
+                    _swapChain.ResizeBuffers(2,
+                        (ushort)(pClientRect.right - pClientRect.left),
+                        (ushort)(pClientRect.bottom - pClientRect.top),
+                        DXGI_FORMAT.DXGI_FORMAT_B8G8R8A8_UNORM,
+                        (ushort)_flagsUsed
+                        );
+                }
+
+                var size = _window.Size;
+
+                // Get swapchain texture here 
+                var texture = _renderTexture;
+                if (texture is null)
+                {
+                    Guid textureGuid = ID3D11Texture2DGuid;
+                    texture = MicroComRuntime.CreateProxyFor<IUnknown>(_swapChain.GetBuffer(0, &textureGuid), true);
+                }
+                _renderTexture = texture;
+
+                // I also have to get the pointer to this texture directly 
+                surface = ((AngleWin32EglDisplay)_egl.Display).WrapDirect3D11Texture(_egl, MicroComRuntime.GetNativeIntPtr(_renderTexture),
+                    0, 0, size.Width, size.Height);
+
+                var res = base.BeginDraw(surface, _window, () =>
+                {
+                    _swapChain.Present((ushort)0U, (ushort)0U);
+                    surface?.Dispose();
+                    transaction?.Dispose();
+                    contextLock?.Dispose();
+                }, true);
+                success = true;
+                return res;
+            }
+            finally
+            {
+                if (!success)
+                {
+                    surface?.Dispose();
+                    if (_renderTexture is not null)
+                    {
+                        _renderTexture.Dispose();
+                        _renderTexture = null;
+                    }
+                    transaction?.Dispose();
+                    contextLock.Dispose();
+                }
+            }
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            _dxgiDevice?.Dispose();
+            _dxgiFactory?.Dispose();
+            _swapChain?.Dispose();
+            _renderTexture?.Dispose();
+        }
+
+        internal static bool RectsEqual(in RECT l, in RECT r)
+        {
+            return (l.left == r.left)
+                && (l.top == r.top)
+                && (l.right == r.right)
+                && (l.bottom == r.bottom);
+        }
+
+    }
+#pragma warning restore CA1416 // Validate platform compatibility
+#nullable restore
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs b/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs
new file mode 100644
index 0000000000..a40d8abf80
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/DxgiSwapchainWindow.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+
+namespace Avalonia.Win32.DxgiSwapchain
+{
+    public class DxgiSwapchainWindow : EglGlPlatformSurfaceBase
+    {
+        private DxgiConnection _connection;
+        private EglPlatformOpenGlInterface _egl;
+        private IEglWindowGlPlatformSurfaceInfo _window;
+
+        public DxgiSwapchainWindow(DxgiConnection connection, IEglWindowGlPlatformSurfaceInfo window)
+        {
+            _connection = connection;
+            _window = window;
+            _egl = connection.Egl;
+        }
+
+        public override IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            using (_egl.PrimaryContext.EnsureCurrent())
+            {
+                return new DxgiRenderTarget(_window, _egl, _connection);
+            }
+        }
+    }
+}
diff --git a/src/Windows/Avalonia.Win32/DirectX/directx.idl b/src/Windows/Avalonia.Win32/DirectX/directx.idl
new file mode 100644
index 0000000000..09d1adf574
--- /dev/null
+++ b/src/Windows/Avalonia.Win32/DirectX/directx.idl
@@ -0,0 +1,305 @@
+@clr-namespace Avalonia.Win32.DxgiSwapchain
+@clr-access internal
+@clr-map FLOAT float
+@clr-map HSTRING IntPtr
+@clr-map Vector2 System.Numerics.Vector2
+@clr-map Vector3 System.Numerics.Vector3
+@clr-map Quaternion System.Numerics.Quaternion
+@clr-map Matrix4x4 System.Numerics.Matrix4x4
+@clr-map RECT Avalonia.Win32.Interop.UnmanagedMethods.RECT
+@clr-map SIZE Avalonia.Win32.Interop.UnmanagedMethods.SIZE
+@clr-map POINT Avalonia.Win32.Interop.UnmanagedMethods.POINT
+@clr-map HWND IntPtr
+@clr-map BOOL int
+@clr-map DWORD int
+@clr-map boolean int
+@clr-map BYTE byte
+@clr-map INT16 short
+@clr-map INT32 int
+@clr-map INT64 long
+@clr-map UINT ushort
+@clr-map UINT16 ushort
+@clr-map ULONG uint
+@clr-map UINT32 uint
+@clr-map UINT64 ulong
+@clr-map DOUBLE double
+@clr-map GUID System.Guid
+@clr-map REFGUID System.Guid*
+@clr-map REFIID System.Guid*
+@clr-map WCHAR System.Char
+@clr-map HMODULE void*
+@clr-map DXGI_USAGE uint
+@clr-map LARGE_INTEGER ulong
+@clr-map INT int
+@clr-map DXGI_SHARED_RESOURCE void*
+@clr-map LUID ulong
+@clr-map LPSTR ushort*
+
+
+enum DXGI_FORMAT
+{
+    DXGI_FORMAT_UNKNOWN = 0,
+    DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
+    DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
+    DXGI_FORMAT_R32G32B32A32_UINT = 3,
+    DXGI_FORMAT_R32G32B32A32_SINT = 4,
+    DXGI_FORMAT_R32G32B32_TYPELESS = 5,
+    DXGI_FORMAT_R32G32B32_FLOAT = 6,
+    DXGI_FORMAT_R32G32B32_UINT = 7,
+    DXGI_FORMAT_R32G32B32_SINT = 8,
+    DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
+    DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
+    DXGI_FORMAT_R16G16B16A16_UNORM = 11,
+    DXGI_FORMAT_R16G16B16A16_UINT = 12,
+    DXGI_FORMAT_R16G16B16A16_SNORM = 13,
+    DXGI_FORMAT_R16G16B16A16_SINT = 14,
+    DXGI_FORMAT_R32G32_TYPELESS = 15,
+    DXGI_FORMAT_R32G32_FLOAT = 16,
+    DXGI_FORMAT_R32G32_UINT = 17,
+    DXGI_FORMAT_R32G32_SINT = 18,
+    DXGI_FORMAT_R32G8X24_TYPELESS = 19,
+    DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
+    DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
+    DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
+    DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
+    DXGI_FORMAT_R10G10B10A2_UNORM = 24,
+    DXGI_FORMAT_R10G10B10A2_UINT = 25,
+    DXGI_FORMAT_R11G11B10_FLOAT = 26,
+    DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
+    DXGI_FORMAT_R8G8B8A8_UNORM = 28,
+    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
+    DXGI_FORMAT_R8G8B8A8_UINT = 30,
+    DXGI_FORMAT_R8G8B8A8_SNORM = 31,
+    DXGI_FORMAT_R8G8B8A8_SINT = 32,
+    DXGI_FORMAT_R16G16_TYPELESS = 33,
+    DXGI_FORMAT_R16G16_FLOAT = 34,
+    DXGI_FORMAT_R16G16_UNORM = 35,
+    DXGI_FORMAT_R16G16_UINT = 36,
+    DXGI_FORMAT_R16G16_SNORM = 37,
+    DXGI_FORMAT_R16G16_SINT = 38,
+    DXGI_FORMAT_R32_TYPELESS = 39,
+    DXGI_FORMAT_D32_FLOAT = 40,
+    DXGI_FORMAT_R32_FLOAT = 41,
+    DXGI_FORMAT_R32_UINT = 42,
+    DXGI_FORMAT_R32_SINT = 43,
+    DXGI_FORMAT_R24G8_TYPELESS = 44,
+    DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
+    DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
+    DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
+    DXGI_FORMAT_R8G8_TYPELESS = 48,
+    DXGI_FORMAT_R8G8_UNORM = 49,
+    DXGI_FORMAT_R8G8_UINT = 50,
+    DXGI_FORMAT_R8G8_SNORM = 51,
+    DXGI_FORMAT_R8G8_SINT = 52,
+    DXGI_FORMAT_R16_TYPELESS = 53,
+    DXGI_FORMAT_R16_FLOAT = 54,
+    DXGI_FORMAT_D16_UNORM = 55,
+    DXGI_FORMAT_R16_UNORM = 56,
+    DXGI_FORMAT_R16_UINT = 57,
+    DXGI_FORMAT_R16_SNORM = 58,
+    DXGI_FORMAT_R16_SINT = 59,
+    DXGI_FORMAT_R8_TYPELESS = 60,
+    DXGI_FORMAT_R8_UNORM = 61,
+    DXGI_FORMAT_R8_UINT = 62,
+    DXGI_FORMAT_R8_SNORM = 63,
+    DXGI_FORMAT_R8_SINT = 64,
+    DXGI_FORMAT_A8_UNORM = 65,
+    DXGI_FORMAT_R1_UNORM = 66,
+    DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
+    DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
+    DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
+    DXGI_FORMAT_BC1_TYPELESS = 70,
+    DXGI_FORMAT_BC1_UNORM = 71,
+    DXGI_FORMAT_BC1_UNORM_SRGB = 72,
+    DXGI_FORMAT_BC2_TYPELESS = 73,
+    DXGI_FORMAT_BC2_UNORM = 74,
+    DXGI_FORMAT_BC2_UNORM_SRGB = 75,
+    DXGI_FORMAT_BC3_TYPELESS = 76,
+    DXGI_FORMAT_BC3_UNORM = 77,
+    DXGI_FORMAT_BC3_UNORM_SRGB = 78,
+    DXGI_FORMAT_BC4_TYPELESS = 79,
+    DXGI_FORMAT_BC4_UNORM = 80,
+    DXGI_FORMAT_BC4_SNORM = 81,
+    DXGI_FORMAT_BC5_TYPELESS = 82,
+    DXGI_FORMAT_BC5_UNORM = 83,
+    DXGI_FORMAT_BC5_SNORM = 84,
+    DXGI_FORMAT_B5G6R5_UNORM = 85,
+    DXGI_FORMAT_B5G5R5A1_UNORM = 86,
+    DXGI_FORMAT_B8G8R8A8_UNORM = 87,
+    DXGI_FORMAT_B8G8R8X8_UNORM = 88,
+    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
+    DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
+    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
+    DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
+    DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
+    DXGI_FORMAT_BC6H_TYPELESS = 94,
+    DXGI_FORMAT_BC6H_UF16 = 95,
+    DXGI_FORMAT_BC6H_SF16 = 96,
+    DXGI_FORMAT_BC7_TYPELESS = 97,
+    DXGI_FORMAT_BC7_UNORM = 98,
+    DXGI_FORMAT_BC7_UNORM_SRGB = 99,
+    DXGI_FORMAT_AYUV = 100,
+    DXGI_FORMAT_Y410 = 101,
+    DXGI_FORMAT_Y416 = 102,
+    DXGI_FORMAT_NV12 = 103,
+    DXGI_FORMAT_P010 = 104,
+    DXGI_FORMAT_P016 = 105,
+    DXGI_FORMAT_420_OPAQUE = 106,
+    DXGI_FORMAT_YUY2 = 107,
+    DXGI_FORMAT_Y210 = 108,
+    DXGI_FORMAT_Y216 = 109,
+    DXGI_FORMAT_NV11 = 110,
+    DXGI_FORMAT_AI44 = 111,
+    DXGI_FORMAT_IA44 = 112,
+    DXGI_FORMAT_P8 = 113,
+    DXGI_FORMAT_A8P8 = 114,
+    DXGI_FORMAT_B4G4R4A4_UNORM = 115,
+    DXGI_FORMAT_P208 = 130,
+    DXGI_FORMAT_V208 = 131,
+    DXGI_FORMAT_V408 = 132,
+    DXGI_FORMAT_FORCE_UINT = -1
+}
+
+enum DXGI_MODE_SCANLINE_ORDER
+{
+    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0,
+    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1,
+    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2,
+    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3
+}
+
+enum DXGI_MODE_SCALING
+{
+    DXGI_MODE_SCALING_UNSPECIFIED = 0,
+    DXGI_MODE_SCALING_CENTERED = 1,
+    DXGI_MODE_SCALING_STRETCHED = 2
+}
+
+[uuid(aec22fb8-76f3-4639-9be0-28eb43a67a2e)]
+interface IDXGIObject : IUnknown
+{
+    HRESULT SetPrivateData([in] REFGUID Name, [in] UINT DataSize, [in] void** pData);
+    HRESULT SetPrivateDataInterface([in] REFGUID Name, [in] IUnknown* pUnknown);
+    HRESULT GetPrivateData([in] REFGUID Name, [in, out] UINT* pDataSize, [out] void** pData);
+    HRESULT GetParent([in] REFIID riid, [out, retval] void** ppParent);
+}
+
+[uuid(7b7166ec-21c7-44ae-b21a-c9ae321ae369)]
+interface IDXGIFactory : IDXGIObject
+{
+    INT32 EnumAdapters([in] UINT Adapter, [out] void* ppAdapter);
+    HRESULT MakeWindowAssociation(HWND WindowHandle, UINT Flags);
+    HRESULT GetWindowAssociation([out, annotation("_Out_")] HWND* pWindowHandle);
+    HRESULT CreateSwapChain([in, annotation("_In_")] IUnknown* pDevice, [in, annotation("_In_")] DXGI_SWAP_CHAIN_DESC* pDesc, [out, annotation("_COM_Outptr_")] IDXGISwapChain** ppSwapChain);
+    HRESULT CreateSoftwareAdapter([in] HMODULE Module, [out, annotation("_COM_Outptr_")] IDXGIAdapter** ppAdapter);
+}
+
+[uuid(3d3e0379-f9de-4d58-bb6c-18d62992f1a6)]
+interface IDXGIDeviceSubObject : IDXGIObject
+{
+    HRESULT GetDevice([in, annotation("_In_")] REFIID riid, [out, retval, annotation("_COM_Outptr_")] void** ppDevice);
+}
+
+[uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0)]
+interface IDXGIAdapter : IDXGIObject
+{
+    INT32 EnumOutputs([in] UINT Output, [in, out] void* ppOutput);
+    HRESULT GetDesc([out, annotation("_Out_")] DXGI_ADAPTER_DESC* pDesc);
+    HRESULT CheckInterfaceSupport([in, annotation("_In_")] REFGUID InterfaceName,[out, annotation("_Out_")] LARGE_INTEGER* pUMDVersion);
+};
+
+[uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a)]
+interface IDXGISwapChain : IDXGIDeviceSubObject
+{
+    HRESULT Present([in] UINT SyncInterval, [in] UINT Flags);
+    HRESULT GetBuffer([in] UINT Buffer, [in, annotation("_In_")] REFIID riid, [in, out, annotation("_COM_Outptr_")] void** ppSurface);
+    HRESULT SetFullscreenState([in] BOOL Fullscreen, [in, annotation("_In_opt_")] IDXGIOutput* pTarget);
+    HRESULT GetFullscreenState([out, annotation("_Out_opt_")] BOOL* pFullscreen, [out, annotation("_COM_Outptr_opt_result_maybenull_")] IDXGIOutput** ppTarget);
+    HRESULT GetDesc([out] DXGI_SWAP_CHAIN_DESC* pDesc);
+    HRESULT ResizeBuffers([in] UINT BufferCount, [in] UINT Width, [in] UINT Height, [in] DXGI_FORMAT NewFormat, [in] UINT SwapChainFlags);
+    HRESULT ResizeTarget([in, annotation("_In_")] DXGI_MODE_DESC* pNewTargetParameters);
+    HRESULT GetContainingOutput([out, annotation("_COM_Outptr_")] IDXGIOutput** ppOutput);
+    HRESULT GetFrameStatistics([out, annotation("_Out_")] DXGI_FRAME_STATISTICS* pStats);
+    HRESULT GetLastPresentCount([out, annotation("_Out_")] UINT* pLastPresentCount);
+}
+
+[uuid(54ec77fa-1377-44e6-8c32-88fd5f44c84c)]
+interface IDXGIDevice : IDXGIObject
+{
+    HRESULT GetAdapter([out] IDXGIAdapter** pAdapter);
+    HRESULT CreateSurface([in, annotation("_In_")] DXGI_SURFACE_DESC* pDesc, [in] UINT NumSurfaces, [in] DXGI_USAGE Usage, [in, annotation("_In_opt_")] DXGI_SHARED_RESOURCE* pSharedResource, [out] IDXGISurface** ppSurface);
+    HRESULT QueryResourceResidency([in] IUnknown* ppResources, [out] DXGI_RESIDENCY* pResidencyStatus, [in] UINT NumResources);
+    HRESULT SetGPUThreadPriority([in] INT Priority);
+    HRESULT GetGPUThreadPriority([out, retval] INT* pPriority);
+}
+
+[uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa)]
+interface IDXGIOutput : IDXGIObject
+{
+    HRESULT GetDesc([out] DXGI_OUTPUT_DESC* pDesc);
+    HRESULT GetDisplayModeList([in] DXGI_FORMAT EnumFormat, [in] UINT Flags, [in, out] UINT* pNumModes, [out] DXGI_MODE_DESC* pDesc);
+    HRESULT FindClosestMatchingMode([in, annotation("_In_")] DXGI_MODE_DESC* pModeToMatch, [out] DXGI_MODE_DESC* pClosestMatch, [in] IUnknown* pConcernedDevice);
+    HRESULT WaitForVBlank();
+    HRESULT TakeOwnership([in, annotation("_In_")] IUnknown* pDevice, BOOL Exclusive);
+    void ReleaseOwnership();
+    HRESULT GetGammaControlCapabilities([out, annotation("_Out_")] DXGI_GAMMA_CONTROL_CAPABILITIES* pGammaCaps);
+    HRESULT SetGammaControl([in, annotation("_In_")] DXGI_GAMMA_CONTROL* pArray);
+    HRESULT GetGammaControl([out, annotation("_Out_")] DXGI_GAMMA_CONTROL* pArray);
+    HRESULT SetDisplaySurface([in, annotation("_In_")] IDXGISurface* pScanoutSurface);
+    HRESULT GetDisplaySurfaceData([in, annotation("_In_")] IDXGISurface* pDestination);
+    HRESULT GetFrameStatistics([out, annotation("_Out_")] DXGI_FRAME_STATISTICS* pStats);
+}
+
+[uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec)]
+interface IDXGISurface : IDXGIDeviceSubObject
+{
+    HRESULT GetDesc([out, annotation("_Out_")] DXGI_SURFACE_DESC* pDesc);
+    HRESULT Map([out, annotation("_Out_")] DXGI_MAPPED_RECT* pLockedRect, [in] UINT MapFlags);
+    HRESULT Unmap();
+}
+
+[uuid(770aae78-f26f-4dba-a829-253c83d1b387)]
+interface IDXGIFactory1 : IDXGIFactory
+{
+    HRESULT EnumAdapters1([in] UINT Adapter, [out, annotation("_COM_Outptr_")] IDXGIAdapter1** ppAdapter);
+    BOOL IsCurrent();
+}
+
+[uuid(29038f61-3839-4626-91fd-086879011a05)]
+interface IDXGIAdapter1 : IDXGIAdapter
+{
+    HRESULT GetDesc1([out, annotation("_Out_")] DXGI_ADAPTER_DESC1* pDesc);
+}
+
+[uuid(50c83a1c-e072-4c48-87b0-3630fa36a6d0)]
+interface IDXGIFactory2 : IDXGIFactory1
+{
+    BOOL IsWindowedStereoEnabled();
+    HRESULT CreateSwapChainForHwnd([in, annotation("_In_")] IUnknown* pDevice, [in, annotation("_In_")] HWND hWnd, [in, annotation("_In_")] DXGI_SWAP_CHAIN_DESC1* pDesc, [in, annotation("_In_opt_")] DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc, [in, annotation("_In_opt_")] IDXGIOutput* pRestrictToOutput, [out, annotation("_COM_Outptr_")] IDXGISwapChain1** ppSwapChain);
+    HRESULT CreateSwapChainForCoreWindow([in, annotation("_In_")] IUnknown* pDevice, [in, annotation("_In_")] IUnknown* pWindow, [in, annotation("_In_")] DXGI_SWAP_CHAIN_DESC1* pDesc, [in, annotation("_In_opt_")] IDXGIOutput* pRestrictToOutput, [out, annotation("_COM_Outptr_")] IDXGISwapChain1** ppSwapChain);
+    HRESULT GetSharedResourceAdapterLuid([annotation("_In_")] HANDLE hResource, [annotation("_Out_")] LUID* pLuid);
+    HRESULT RegisterStereoStatusWindow([in, annotation("_In_")] HWND WindowHandle, [in, annotation("_In_")] UINT wMsg, [out, annotation("_Out_")] DWORD* pdwCookie);
+    HRESULT RegisterStereoStatusEvent([in, annotation("_In_")] HANDLE hEvent, [out, annotation("_Out_")] DWORD* pdwCookie);
+    void UnregisterStereoStatus([in, annotation("_In_")] DWORD dwCookie);
+    HRESULT RegisterOcclusionStatusWindow([in, annotation("_In_")] HWND WindowHandle, [in, annotation("_In_")] UINT wMsg, [out, annotation("_Out_")] DWORD* pdwCookie);
+    HRESULT RegisterOcclusionStatusEvent([in, annotation("_In_")] HANDLE hEvent, [out, annotation("_Out_")] DWORD* pdwCookie);
+    void UnregisterOcclusionStatus([in, annotation("_In_")] DWORD dwCookie);
+    HRESULT CreateSwapChainForComposition([in, annotation("_In_")] IUnknown* pDevice, [in, annotation("_In_")] DXGI_SWAP_CHAIN_DESC1* pDesc, [in, annotation("_In_opt_")] IDXGIOutput* pRestrictToOutput, [out, annotation("_COM_Outptr_")] IDXGISwapChain1** ppSwapChain);
+}
+
+[uuid(790a45f7-0d42-4876-983a-0a55cfe6f4aa)]
+interface IDXGISwapChain1 : IDXGISwapChain
+{
+    HRESULT GetDesc1([out, annotation("_Out_")] DXGI_SWAP_CHAIN_DESC1* pDesc);
+    HRESULT GetFullscreenDesc([out, annotation("_Out_")] DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pDesc);
+    HRESULT GetHwnd([out, annotation("_Out_")] HWND* pHwnd);
+    HRESULT GetCoreWindow([in, annotation("_In_")] REFIID refiid, [out, annotation("_COM_Outptr_")] void** ppUnk);
+    HRESULT Present1([in] UINT SyncInterval, [in] UINT PresentFlags, [in, annotation("_In_")] DXGI_PRESENT_PARAMETERS* pPresentParameters);
+    BOOL IsTemporaryMonoSupported();
+    HRESULT GetRestrictToOutput([out, annotation("_Out_")] IDXGIOutput** ppRestrictToOutput);
+    HRESULT SetBackgroundColor([in, annotation("_In_")] DXGI_RGBA* pColor);
+    HRESULT GetBackgroundColor([out, annotation("_Out_")] DXGI_RGBA* pColor);
+    HRESULT SetRotation([in, annotation("_In_")] DXGI_MODE_ROTATION Rotation);
+    HRESULT GetRotation([out, annotation("_Out_")] DXGI_MODE_ROTATION* pRotation);
+}
+
diff --git a/src/Windows/Avalonia.Win32/PopupImpl.cs b/src/Windows/Avalonia.Win32/PopupImpl.cs
index 38dc4a16dc..3a56af12f0 100644
--- a/src/Windows/Avalonia.Win32/PopupImpl.cs
+++ b/src/Windows/Avalonia.Win32/PopupImpl.cs
@@ -92,7 +92,7 @@ namespace Avalonia.Win32
                 IntPtr.Zero);
             s_parentHandle = IntPtr.Zero;
 
-            EnableBoxShadow(result, _dropShadowHint);
+            PopupImpl.EnableBoxShadow(result, _dropShadowHint);
 
             return result;
         }
@@ -139,7 +139,7 @@ namespace Avalonia.Win32
             //TODO: We ignore the scaling override for now
         }
 
-        private void EnableBoxShadow (IntPtr hwnd, bool enabled)
+        private static void EnableBoxShadow (IntPtr hwnd, bool enabled)
         {
             var classes = (int)UnmanagedMethods.GetClassLongPtr(hwnd, (int)UnmanagedMethods.ClassLongIndex.GCL_STYLE);
 
@@ -161,7 +161,7 @@ namespace Avalonia.Win32
 
             if (Handle != null)
             {
-                EnableBoxShadow(Handle.Handle, enabled);
+                PopupImpl.EnableBoxShadow(Handle.Handle, enabled);
             }
         }
 
diff --git a/src/Windows/Avalonia.Win32/Win32GlManager.cs b/src/Windows/Avalonia.Win32/Win32GlManager.cs
index 39a742d1ac..204acc82c9 100644
--- a/src/Windows/Avalonia.Win32/Win32GlManager.cs
+++ b/src/Windows/Avalonia.Win32/Win32GlManager.cs
@@ -2,6 +2,7 @@ using Avalonia.OpenGL;
 using Avalonia.OpenGL.Angle;
 using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
+using Avalonia.Win32.DxgiSwapchain;
 using Avalonia.Win32.OpenGl;
 using Avalonia.Win32.WinRT.Composition;
 
@@ -49,6 +50,10 @@ namespace Avalonia.Win32
                     {
                         WinUICompositorConnection.TryCreateAndRegister(egl, opts.CompositionBackdropCornerRadius);
                     }
+                    else if (opts.UseLowLatencyDxgiSwapChain)
+                    {
+                        DxgiConnection.TryCreateAndRegister(egl);
+                    }
                 }
 
                 return egl;
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 18977ec4c3..63cad9679a 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -96,6 +96,16 @@ namespace Avalonia
         /// This can be useful when you need a rounded-corner blurred Windows 10 app, or borderless Windows 11 app
         /// </summary>
         public float? CompositionBackdropCornerRadius { get; set; }
+
+        /// <summary>
+        /// When <see cref="UseLowLatencyDxgiSwapChain"/> is active, renders Avalonia through a low-latency Dxgi Swapchain.
+        /// Requires Feature Level 11_3 to be active, Windows 8.1+ Any Subversion. 
+        /// This is only recommended if low input latency is desirable, and there is no need for the transparency
+        /// and stylings / blurrings offered by <see cref="UseWindowsUIComposition"/><br/>
+        /// This is mutually exclusive with 
+        /// <see cref="UseWindowsUIComposition"/> which if active will override this setting. 
+        /// </summary>
+        public bool UseLowLatencyDxgiSwapChain { get; set; } = false;
     }
 }
 
@@ -174,16 +184,16 @@ namespace Avalonia.Win32
         public bool HasMessages()
         {
             UnmanagedMethods.MSG msg;
-            return UnmanagedMethods.PeekMessage(out msg, IntPtr.Zero, 0, 0, 0);
+            return PeekMessage(out msg, IntPtr.Zero, 0, 0, 0);
         }
 
         public void ProcessMessage()
         {
 
-            if (UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0) > -1)
+            if (GetMessage(out var msg, IntPtr.Zero, 0, 0) > -1)
             {
-                UnmanagedMethods.TranslateMessage(ref msg);
-                UnmanagedMethods.DispatchMessage(ref msg);
+                TranslateMessage(ref msg);
+                DispatchMessage(ref msg);
             }
             else
             {
@@ -197,10 +207,10 @@ namespace Avalonia.Win32
         {
             var result = 0;
             while (!cancellationToken.IsCancellationRequested 
-                && (result = UnmanagedMethods.GetMessage(out var msg, IntPtr.Zero, 0, 0)) > 0)
+                && (result = GetMessage(out var msg, IntPtr.Zero, 0, 0)) > 0)
             {
-                UnmanagedMethods.TranslateMessage(ref msg);
-                UnmanagedMethods.DispatchMessage(ref msg);
+                TranslateMessage(ref msg);
+                DispatchMessage(ref msg);
             }
             if (result < 0)
             {
@@ -214,7 +224,7 @@ namespace Avalonia.Win32
             UnmanagedMethods.TimerProc timerDelegate =
                 (hWnd, uMsg, nIDEvent, dwTime) => callback();
 
-            IntPtr handle = UnmanagedMethods.SetTimer(
+            IntPtr handle = SetTimer(
                 IntPtr.Zero,
                 IntPtr.Zero,
                 (uint)interval.TotalMilliseconds,
@@ -226,7 +236,7 @@ namespace Avalonia.Win32
             return Disposable.Create(() =>
             {
                 _delegates.Remove(timerDelegate);
-                UnmanagedMethods.KillTimer(IntPtr.Zero, handle);
+                KillTimer(IntPtr.Zero, handle);
             });
         }
 
@@ -235,9 +245,9 @@ namespace Avalonia.Win32
 
         public void Signal(DispatcherPriority prio)
         {
-            UnmanagedMethods.PostMessage(
+            PostMessage(
                 _hwnd,
-                (int) UnmanagedMethods.WindowsMessage.WM_DISPATCH_WORK_ITEM,
+                (int)WindowsMessage.WM_DISPATCH_WORK_ITEM,
                 new IntPtr(SignalW),
                 new IntPtr(SignalL));
         }
@@ -251,7 +261,7 @@ namespace Avalonia.Win32
         [SuppressMessage("Microsoft.StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation", Justification = "Using Win32 naming for consistency.")]
         private IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
-            if (msg == (int) UnmanagedMethods.WindowsMessage.WM_DISPATCH_WORK_ITEM && wParam.ToInt64() == SignalW && lParam.ToInt64() == SignalL)
+            if (msg == (int)WindowsMessage.WM_DISPATCH_WORK_ITEM && wParam.ToInt64() == SignalW && lParam.ToInt64() == SignalL)
             {
                 Signaled?.Invoke(null);
             }
@@ -273,7 +283,7 @@ namespace Avalonia.Win32
             
             TrayIconImpl.ProcWnd(hWnd, msg, wParam, lParam);
 
-            return UnmanagedMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+            return DefWindowProc(hWnd, msg, wParam, lParam);
         }
 
         private void CreateMessageWindow()
@@ -285,18 +295,18 @@ namespace Avalonia.Win32
             {
                 cbSize = Marshal.SizeOf<UnmanagedMethods.WNDCLASSEX>(),
                 lpfnWndProc = _wndProcDelegate,
-                hInstance = UnmanagedMethods.GetModuleHandle(null),
+                hInstance = GetModuleHandle(null),
                 lpszClassName = "AvaloniaMessageWindow " + Guid.NewGuid(),
             };
 
-            ushort atom = UnmanagedMethods.RegisterClassEx(ref wndClassEx);
+            ushort atom = RegisterClassEx(ref wndClassEx);
 
             if (atom == 0)
             {
                 throw new Win32Exception();
             }
 
-            _hwnd = UnmanagedMethods.CreateWindowEx(0, atom, null, 0, 0, 0, 0, 0, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+            _hwnd = CreateWindowEx(0, atom, null, 0, 0, 0, 0, 0, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
 
             if (_hwnd == IntPtr.Zero)
             {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
index 4ce13ae0e0..08762f7d9f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -377,7 +377,7 @@ namespace Avalonia.Win32
                                     RawPointerEventType.XButton1Down :
                                     RawPointerEventType.XButton2Down,
                             },
-                            PointToClient(PointFromLParam(lParam)), GetMouseModifiers(wParam));
+                            PointToClient(WindowImpl.PointFromLParam(lParam)), GetMouseModifiers(wParam));
                         break;
                     }
                 case WindowsMessage.WM_TOUCH:
@@ -1035,7 +1035,7 @@ namespace Avalonia.Win32
             return new Point((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16)) / RenderScaling;
         }
 
-        private PixelPoint PointFromLParam(IntPtr lParam)
+        private static PixelPoint PointFromLParam(IntPtr lParam)
         {
             return new PixelPoint((short)(ToInt32(lParam) & 0xffff), (short)(ToInt32(lParam) >> 16));
         }
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index 5414672498..d393bd304a 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -13,7 +13,7 @@ namespace Avalonia.Win32
         private HitTestValues HitTestNCA(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
         {
             // Get the point coordinates for the hit test (screen space).
-            var ptMouse = PointFromLParam(lParam);
+            var ptMouse = WindowImpl.PointFromLParam(lParam);
 
             // Get the window rectangle.
             GetWindowRect(hWnd, out var rcWindow);
@@ -105,7 +105,7 @@ namespace Avalonia.Win32
 
                         if (hittestResult == HitTestValues.HTCAPTION)
                         {
-                            var position = PointToClient(PointFromLParam(lParam));
+                            var position = PointToClient(WindowImpl.PointFromLParam(lParam));
 
                             if (_owner is Window window)
                             {
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 800524f83c..5f813eec1d 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -26,6 +26,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods;
 using Avalonia.Collections.Pooled;
 using Avalonia.Metadata;
 using Avalonia.Platform.Storage;
+using Avalonia.Win32.DxgiSwapchain;
 
 namespace Avalonia.Win32
 {
@@ -63,6 +64,7 @@ namespace Avalonia.Win32
         private Thickness _offScreenMargin;
         private double _extendTitleBarHint = -1;
         private bool _isUsingComposition;
+        private bool _isUsingDxgiSwapchain;
         private IBlurHost _blurHost;
         private PlatformResizeReason _resizeReason;
         private MOUSEMOVEPOINT _lastWmMousePoint;
@@ -143,6 +145,16 @@ namespace Avalonia.Win32
                     egl.Display is AngleWin32EglDisplay angleDisplay &&
                     angleDisplay.PlatformApi == AngleOptions.PlatformApi.DirectX11;
 
+            DxgiConnection dxgiConnection = null;
+            if (!_isUsingComposition)
+            {
+                dxgiConnection = AvaloniaLocator.Current.GetService<DxgiConnection>();
+                _isUsingDxgiSwapchain = dxgiConnection is { } &&
+                    glPlatform is EglPlatformOpenGlInterface eglDxgi &&
+                        eglDxgi.Display is AngleWin32EglDisplay angleDisplayDxgi &&
+                        angleDisplayDxgi.PlatformApi == AngleOptions.PlatformApi.DirectX11;
+            }
+
             _wmPointerEnabled = Win32Platform.WindowsVersion >= PlatformConstants.Windows8;
 
             CreateWindow();
@@ -159,6 +171,11 @@ namespace Avalonia.Win32
 
                     _isUsingComposition = true;
                 }
+                else if (_isUsingDxgiSwapchain)
+                {
+                    var dxgigl = new DxgiSwapchainWindow(dxgiConnection, this);
+                    _gl = dxgigl;
+                }
                 else
                 {
                     if (glPlatform is EglPlatformOpenGlInterface egl2)
@@ -649,7 +666,7 @@ namespace Avalonia.Win32
         public Point PointToClient(PixelPoint point)
         {
             var p = new POINT { X = point.X, Y = point.Y };
-            UnmanagedMethods.ScreenToClient(_hwnd, ref p);
+            ScreenToClient(_hwnd, ref p);
             return new Point(p.X, p.Y) / RenderScaling;
         }
 
@@ -1330,12 +1347,13 @@ namespace Avalonia.Win32
         private const int MF_DISABLED = 0x2;
         private const int SC_CLOSE = 0xF060;
 
-        void DisableCloseButton(IntPtr hwnd)
+        static void DisableCloseButton(IntPtr hwnd)
         {
             EnableMenuItem(GetSystemMenu(hwnd, false), SC_CLOSE,
                            MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
         }
-        void EnableCloseButton(IntPtr hwnd)
+
+        static void EnableCloseButton(IntPtr hwnd)
         {
             EnableMenuItem(GetSystemMenu(hwnd, false), SC_CLOSE,
                            MF_BYCOMMAND | MF_ENABLED);
diff --git a/src/iOS/Avalonia.iOS/CombinedSpan3.cs b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
index e9f44b7d58..13faea1848 100644
--- a/src/iOS/Avalonia.iOS/CombinedSpan3.cs
+++ b/src/iOS/Avalonia.iOS/CombinedSpan3.cs
@@ -16,7 +16,7 @@ internal ref struct CombinedSpan3<T>
 
     public int Length => Span1.Length + Span2.Length + Span3.Length;
 
-    void CopyFromSpan(ReadOnlySpan<T> from, int offset, ref Span<T> to)
+    static void CopyFromSpan(ReadOnlySpan<T> from, int offset, ref Span<T> to)
     {
         if(to.Length == 0)
             return;
diff --git a/src/iOS/Avalonia.iOS/TouchHandler.cs b/src/iOS/Avalonia.iOS/TouchHandler.cs
index 959a660d8a..44bf08365f 100644
--- a/src/iOS/Avalonia.iOS/TouchHandler.cs
+++ b/src/iOS/Avalonia.iOS/TouchHandler.cs
@@ -19,7 +19,7 @@ namespace Avalonia.iOS
             _tl = tl;
         }
 
-        ulong Ts(UIEvent evt) => (ulong) (evt.Timestamp * 1000);
+        static ulong Ts(UIEvent evt) => (ulong) (evt.Timestamp * 1000);
         private IInputRoot Root => _view.InputRoot;
         private static long _nextTouchPointId = 1;
         private Dictionary<UITouch, long> _knownTouches = new Dictionary<UITouch, long>();
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
index e0ea5b20ae..135ab0426e 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
@@ -92,7 +92,7 @@ class Template
         }}
 ";
 
-        private ClassDeclarationSyntax AppendListProxy(GList list, ClassDeclarationSyntax cl)
+        private static ClassDeclarationSyntax AppendListProxy(GList list, ClassDeclarationSyntax cl)
         {
 
             var itemType = list.ItemType;
@@ -120,4 +120,4 @@ class Template
         }
         
     }
-}
\ No newline at end of file
+}
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs
index 16aa15d95a..e2c5d682c1 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs
@@ -37,12 +37,11 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                        unit.NormalizeWhitespace().ToFullString();
             _output.AddSource(string.Join("_", path), text);
         }
-        
-        
-        SyntaxToken Semicolon() => Token(SyntaxKind.SemicolonToken);
 
-        
-        FieldDeclarationSyntax DeclareConstant(string type, string name, LiteralExpressionSyntax value)
+        static SyntaxToken Semicolon() => Token(SyntaxKind.SemicolonToken);
+
+
+        static FieldDeclarationSyntax DeclareConstant(string type, string name, LiteralExpressionSyntax value)
             => FieldDeclaration(
                     VariableDeclaration(ParseTypeName(type),
                         SingletonSeparatedList(
@@ -51,10 +50,10 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                 ).WithSemicolonToken(Semicolon())
                 .WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword), Token(SyntaxKind.ConstKeyword)));
 
-        FieldDeclarationSyntax DeclareField(string type, string name, params SyntaxKind[] modifiers) =>
+        static FieldDeclarationSyntax DeclareField(string type, string name, params SyntaxKind[] modifiers) =>
             DeclareField(type, name, null, modifiers);
 
-        FieldDeclarationSyntax DeclareField(string type, string name, EqualsValueClauseSyntax? initializer,
+        static FieldDeclarationSyntax DeclareField(string type, string name, EqualsValueClauseSyntax? initializer,
             params SyntaxKind[] modifiers) =>
             FieldDeclaration(
                     VariableDeclaration(ParseTypeName(type),
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
index 5c4af5de2e..f8d5ad826e 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -35,16 +35,14 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
             GenerateAnimations();
         }
 
-
-
-        string ServerName(string? c) => c != null ? ("Server" + c) : "ServerObject";
-        string ChangesName(string? c) => c != null ? (c + "Changes") : "ChangeSet";
-        string ChangedFieldsTypeName(GClass c) => c.Name + "ChangedFields";
-        string ChangedFieldsFieldName(GClass c) =>  "_changedFieldsOf" + c.Name;
-        string PropertyBackingFieldName(GProperty prop) => "_" + prop.Name.WithLowerFirst();
-        string CompositionPropertyField(GProperty prop) => "s_IdOf" + prop.Name + "Property";
-
-        ExpressionSyntax ClientProperty(GClass c, GProperty p) =>
+        static string ServerName(string? c) => c != null ? ("Server" + c) : "ServerObject";
+        static string ChangesName(string? c) => c != null ? (c + "Changes") : "ChangeSet";
+        static string ChangedFieldsTypeName(GClass c) => c.Name + "ChangedFields";
+        static string ChangedFieldsFieldName(GClass c) =>  "_changedFieldsOf" + c.Name;
+        static string PropertyBackingFieldName(GProperty prop) => "_" + prop.Name.WithLowerFirst();
+        static string CompositionPropertyField(GProperty prop) => "s_IdOf" + prop.Name + "Property";
+
+        static ExpressionSyntax ClientProperty(GClass c, GProperty p) =>
             MemberAccess(ServerName(c.Name), CompositionPropertyField(p));
 
         void GenerateClass(GClass cl)
@@ -313,7 +311,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                 "Server", "Server" + cl.Name + ".generated.cs");
         }
         
-        private ClassDeclarationSyntax GenerateClientProperty(ClassDeclarationSyntax client, GClass cl, GProperty prop,
+        private static ClassDeclarationSyntax GenerateClientProperty(ClassDeclarationSyntax client, GClass cl, GProperty prop,
             TypeSyntax propType, bool isObject, bool isNullable)
         {
             var fieldName = PropertyBackingFieldName(prop);
@@ -346,7 +344,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                         .AddModifiers(SyntaxKind.PartialKeyword).WithSemicolonToken(Semicolon()));
         }
 
-        EnumDeclarationSyntax GenerateChangedFieldsEnum(GClass cl)
+        static EnumDeclarationSyntax GenerateChangedFieldsEnum(GClass cl)
         {
             var changedFieldsEnum = EnumDeclaration(Identifier(ChangedFieldsTypeName(cl)));
             int count = 0;
@@ -373,7 +371,7 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                 .AddAttributeLists(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("System.Flags")))));
         }
 
-        StatementSyntax GeneratePropertySetterAssignment(GClass cl, GProperty prop, bool isObject, bool isNullable)
+        static StatementSyntax GeneratePropertySetterAssignment(GClass cl, GProperty prop, bool isObject, bool isNullable)
         {
             var code = @$"
     // Update the backing value
@@ -406,8 +404,8 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
 
             return ParseStatement("{\n" + code + "\n}");
         }
-        
-        BlockSyntax ApplyStartAnimation(BlockSyntax body, GClass cl, GProperty prop)
+
+        static BlockSyntax ApplyStartAnimation(BlockSyntax body, GClass cl, GProperty prop)
         {
             var code = $@"
 if (propertyName == ""{prop.Name}"")
@@ -437,8 +435,8 @@ return;
             "Color",
             "Avalonia.Media.Color"
         };
-        
-        BlockSyntax ApplyGetProperty(BlockSyntax body, GProperty prop, string? expr = null)
+
+        static BlockSyntax ApplyGetProperty(BlockSyntax body, GProperty prop, string? expr = null)
         {
             if (VariantPropertyTypes.Contains(prop.Type))
                 return body.AddStatements(
@@ -448,7 +446,7 @@ return;
             return body;
         }
         
-        private BlockSyntax SerializeChangesPrologue(GClass cl)
+        private static BlockSyntax SerializeChangesPrologue(GClass cl)
         {
             return Block(
                 ParseStatement("base.SerializeChangesCore(writer);"),
@@ -456,10 +454,10 @@ return;
                 );
         }
 
-        private BlockSyntax SerializeChangesEpilogue(GClass cl) =>
+        private static BlockSyntax SerializeChangesEpilogue(GClass cl) =>
             Block(ParseStatement(ChangedFieldsFieldName(cl) + " = default;"));
-        
-        BlockSyntax ApplySerializeField(BlockSyntax body, GClass cl, GProperty prop, bool isObject, bool isPassthrough)
+
+        static BlockSyntax ApplySerializeField(BlockSyntax body, GClass cl, GProperty prop, bool isObject, bool isPassthrough)
         {
             var changedFields = ChangedFieldsFieldName(cl);
             var changedFieldsType = ChangedFieldsTypeName(cl);
@@ -480,7 +478,7 @@ return;
             return body.AddStatements(ParseStatement(code));
         }     
         
-        private BlockSyntax DeserializeChangesPrologue(GClass cl)
+        private static BlockSyntax DeserializeChangesPrologue(GClass cl)
         {
             return Block(ParseStatement($@"
 base.DeserializeChangesCore(reader, commitedAt);
@@ -489,12 +487,12 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
 "));
         }
 
-        private BlockSyntax ApplyDeserializeChangesEpilogue(BlockSyntax body, GClass cl)
+        private static BlockSyntax ApplyDeserializeChangesEpilogue(BlockSyntax body, GClass cl)
         {
             return body.AddStatements(ParseStatement("OnFieldsDeserialized(changed);"));
         }
-        
-        BlockSyntax ApplyDeserializeField(BlockSyntax body, GClass cl, GProperty prop, string serverType, bool isObject)
+
+        static BlockSyntax ApplyDeserializeField(BlockSyntax body, GClass cl, GProperty prop, string serverType, bool isObject)
         {
             var changedFieldsType = ChangedFieldsTypeName(cl);
             var code = "";
@@ -516,7 +514,7 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
             return body.AddStatements(ParseStatement(code));
         }
 
-        ClassDeclarationSyntax WithGetPropertyForAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
+        static ClassDeclarationSyntax WithGetPropertyForAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
         {
             if (body.Statements.Count == 0)
                 return cl;
@@ -528,8 +526,8 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
 
             return cl.AddMembers(method);
         }
-        
-        ClassDeclarationSyntax WithGetCompositionProperty(ClassDeclarationSyntax cl, BlockSyntax body)
+
+        static ClassDeclarationSyntax WithGetCompositionProperty(ClassDeclarationSyntax cl, BlockSyntax body)
         {
             if (body.Statements.Count == 0)
                 return cl;
@@ -542,7 +540,7 @@ var changed = reader.Read<{ChangedFieldsTypeName(cl)}>();
             return cl.AddMembers(method);
         }
 
-        ClassDeclarationSyntax WithStartAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
+        static ClassDeclarationSyntax WithStartAnimation(ClassDeclarationSyntax cl, BlockSyntax body)
         {
             body = body.AddStatements(
                 ExpressionStatement(InvocationExpression(MemberAccess("base", "StartAnimation"),
diff --git a/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs
new file mode 100644
index 0000000000..9b38422dde
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Composition/CompositionAnimationTests.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using Avalonia.Animation.Easings;
+using Avalonia.Base.UnitTests.Rendering;
+using Avalonia.Rendering;
+using Avalonia.Rendering.Composition;
+using Avalonia.Rendering.Composition.Expressions;
+using Avalonia.Rendering.Composition.Server;
+using Avalonia.Threading;
+using Xunit;
+using Xunit.Sdk;
+
+namespace Avalonia.Base.UnitTests.Composition;
+
+public class CompositionAnimationTests
+{
+
+    class AnimationDataProvider : DataAttribute
+    {
+        IEnumerable<AnimationData> Generate() =>
+            new AnimationData[]
+            {
+                new("3 frames starting from 0")
+                {
+                    Frames =
+                    {
+                        (0f, 10f),
+                        (0.5f, 30f),
+                        (1f, 20f)
+                    },
+                    Checks =
+                    {
+                        (0.25f, 20f),
+                        (0.5f, 30f),
+                        (0.75f, 25f),
+                        (1f, 20f)
+                    }
+                },
+                new("1 final frame")
+                {
+                    Frames =
+                    {
+                        (1f, 10f)
+                    },
+                    Checks =
+                    {
+                        (0f, 0f),
+                        (0.5f, 5f),
+                        (1f, 10f)
+                    }
+                }
+            };
+
+        public override IEnumerable<object[]> GetData(MethodInfo testMethod)
+        {
+            foreach (var ani in Generate())
+            {
+                yield return new Object[] { ani };
+            }
+        }
+    }
+    
+    [AnimationDataProvider]
+    [Theory]
+    public void GenericCheck(AnimationData data)
+    {
+        var compositor =
+            new Compositor(new RenderLoop(new CompositorTestsBase.ManualRenderTimer(), new Dispatcher(null)), null);
+        var target = compositor.CreateSolidColorVisual();
+        var ani = new ScalarKeyFrameAnimation(null);
+        foreach (var frame in data.Frames)
+            ani.InsertKeyFrame(frame.key, frame.value, new LinearEasing());
+        ani.Duration = TimeSpan.FromSeconds(1);
+        var instance = ani.CreateInstance(target.Server, null);
+        instance.Initialize(TimeSpan.Zero, data.StartingValue, ServerCompositionVisual.s_IdOfRotationAngleProperty);
+        var currentValue = ExpressionVariant.Create(data.StartingValue);
+        foreach (var check in data.Checks)
+        {
+            currentValue = instance.Evaluate(TimeSpan.FromSeconds(check.time), currentValue);
+            Assert.Equal(check.value, currentValue.Scalar);
+        }
+        
+    }
+    
+    public class AnimationData
+    {
+        public AnimationData(string name)
+        {
+            Name = name;
+        }
+
+        public string Name { get;  }
+        public List<(float key, float value)> Frames { get; set; } = new();
+        public List<(float time, float value)> Checks { get; set; } = new();
+        public float StartingValue { get; set; }
+        public float Duration { get; set; } = 1;
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
index d496817147..435980bd9a 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
             GC.KeepAlive(data);
         }
 
-        private Recorded<Notification<T>> OnNext<T>(long time, T value)
+        private static Recorded<Notification<T>> OnNext<T>(long time, T value)
         {
             return new Recorded<Notification<T>>(time, Notification.CreateOnNext<T>(value));
         }
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
index f911048960..144d9e6668 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
@@ -730,7 +730,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
         {
         }
 
-        private Recorded<Notification<T>> OnNext<T>(long time, T value)
+        private static Recorded<Notification<T>> OnNext<T>(long time, T value)
         {
             return new Recorded<Notification<T>>(time, Notification.CreateOnNext<T>(value));
         }
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
index ca564a6809..cf70a617bf 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
@@ -143,7 +143,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
             }
         }
 
-        private Task TaskFromException(Exception e)
+        private static Task TaskFromException(Exception e)
         {
             var tcs = new TaskCompletionSource<object>();
             tcs.SetException(e);
diff --git a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
index 57ec00cb58..508eff5f9d 100644
--- a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
@@ -167,7 +167,7 @@ namespace Avalonia.Base.UnitTests.Input
             Assert.False(raised);
         }
 
-        private void AddHandlers(
+        private static void AddHandlers(
             Decorator decorator,
             Border border,
             IList<string> result,
diff --git a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
index 3f80599b28..1a8b72d5e5 100644
--- a/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Interactivity/InteractiveTests.cs
@@ -378,7 +378,7 @@ namespace Avalonia.Base.UnitTests.Interactivity
             Assert.Equal(new[] { "3", "2b", "1" }, invoked);
         }
 
-        private TestInteractive CreateTree(
+        private static TestInteractive CreateTree(
             RoutedEvent ev,
             EventHandler<RoutedEventArgs> handler,
             RoutingStrategies handlerRoutes,
diff --git a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
index a58d28004f..98a2d76b48 100644
--- a/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
+++ b/tests/Avalonia.Base.UnitTests/Layout/LayoutableTests_EffectiveViewportChanged.cs
@@ -336,21 +336,21 @@ namespace Avalonia.Base.UnitTests.Layout
             });
         }
 
-        private TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
+        private static TestRoot CreateRoot() => new TestRoot { Width = 1200, Height = 900 };
 
-        private Task ExecuteInitialLayoutPass(TestRoot root)
+        private static Task ExecuteInitialLayoutPass(TestRoot root)
         {
             root.LayoutManager.ExecuteInitialLayoutPass();
             return Task.CompletedTask;
         }
 
-        private Task ExecuteLayoutPass(TestRoot root)
+        private static Task ExecuteLayoutPass(TestRoot root)
         {
             root.LayoutManager.ExecuteLayoutPass();
             return Task.CompletedTask;
         }
 
-        private Task ExecuteScrollerLayoutPass(
+        private static Task ExecuteScrollerLayoutPass(
             TestRoot root,
             ScrollViewer scroller,
             Control target,
@@ -365,7 +365,7 @@ namespace Avalonia.Base.UnitTests.Layout
             root.LayoutManager.ExecuteLayoutPass();
             return Task.CompletedTask;
         }
-        private IControlTemplate ScrollViewerTemplate()
+        private static IControlTemplate ScrollViewerTemplate()
         {
             return new FuncControlTemplate<ScrollViewer>((control, scope) => new Grid
             {
@@ -415,7 +415,7 @@ namespace Avalonia.Base.UnitTests.Layout
             });
         }
 
-        private void AssertArePixelEqual(Rect expected, Rect actual)
+        private static void AssertArePixelEqual(Rect expected, Rect actual)
         {
             var expectedRounded = new Rect((int)expected.X, (int)expected.Y, (int)expected.Width, (int)expected.Height);
             var actualRounded = new Rect((int)actual.X, (int)actual.Y, (int)actual.Width, (int)actual.Height);
diff --git a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
index ffcbbb4b2e..a3275e6ee8 100644
--- a/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Layout/NonVirtualizingStackLayoutTests.cs
@@ -310,7 +310,7 @@ namespace Avalonia.Base.UnitTests.Layout
             Assert.Equal(new Size(10, 10), arrangeSize);
         }
 
-        private NonVirtualizingLayoutContext CreateContext(Control[] children)
+        private static NonVirtualizingLayoutContext CreateContext(Control[] children)
         {
             return new TestLayoutContext(children);
         }
diff --git a/tests/Avalonia.Base.UnitTests/MatrixTests.cs b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
index 99fe4685d7..d111c14258 100644
--- a/tests/Avalonia.Base.UnitTests/MatrixTests.cs
+++ b/tests/Avalonia.Base.UnitTests/MatrixTests.cs
@@ -19,7 +19,7 @@ public class MatrixTests
     /// </summary>
     /// <param name="expected">The expected vector</param>
     /// <param name="actual">The actual transformed point</param>
-    private void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual)
+    private static void AssertCoordinatesEqualWithReducedPrecision(Vector2 expected, Point actual)
     {
         double ReducePrecision(double input) => Math.Truncate(input * 10000);
         
@@ -86,7 +86,7 @@ public class MatrixTests
         var matrix = Matrix.CreateSkew(30, 20);
         var point = new Point(1, 1);
         var actual = matrix.Transform(point);
-        
+
         AssertCoordinatesEqualWithReducedPrecision(expected, actual);
     }
 }
diff --git a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
index 387b2f4a19..afe03461e8 100644
--- a/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Media/RectangleGeometryTests.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Base.UnitTests.Media
             }
         }
 
-        private TestServices GetServices()
+        private static TestServices GetServices()
         {
             var context = Mock.Of<IStreamGeometryContextImpl>();
             var transformedGeometry = new Mock<ITransformedGeometryImpl>();
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index d83bb12aea..27faf1e13c 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -460,7 +460,7 @@ public class CompositorHitTestingTests : CompositorTestsBase
         }
     }
 
-    private IDisposable TestApplication()
+    private static IDisposable TestApplication()
     {
         return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
     }
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index fa8db25a25..2cf42d9604 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -569,7 +569,7 @@ namespace Avalonia.Base.UnitTests.Rendering
             }
         }
 
-        private IDisposable TestApplication()
+        private static IDisposable TestApplication()
         {
             return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
         }
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
index 5b5883c950..70e4acba1e 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -450,7 +450,7 @@ namespace Avalonia.Base.UnitTests.Rendering
             }
         }
 
-        private IDisposable TestApplication()
+        private static IDisposable TestApplication()
         {
             return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
         }
diff --git a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
index 69d37d1c54..cf53058d0b 100644
--- a/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
+++ b/tests/Avalonia.Base.UnitTests/Styling/StyledElementTests_Resources.cs
@@ -198,7 +198,7 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.True(raised);
         }
 
-        private IControlTemplate ContentControlTemplate()
+        private static IControlTemplate ContentControlTemplate()
         {
             return new FuncControlTemplate<ContentControl>((x, scope) =>
                 new ContentPresenter
diff --git a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
index 34dd528f7c..b40ea40985 100644
--- a/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
+++ b/tests/Avalonia.Base.UnitTests/VisualTree/VisualExtensions_GetVisualsAt.cs
@@ -96,7 +96,7 @@ namespace Avalonia.Base.UnitTests.VisualTree
             }
         }
 
-        private IDisposable TestApplication()
+        private static IDisposable TestApplication()
         {
             return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
         }
diff --git a/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs b/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs
index 81b882308d..9274724c8c 100644
--- a/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs
+++ b/tests/Avalonia.Base.UnitTests/WeakEventHandlerManagerTests.cs
@@ -79,7 +79,7 @@ namespace Avalonia.Base.UnitTests
             Assert.False(handled);
         }
 
-        private void AddCollectableSubscriber(EventSource source, string name, Action func)
+        private static void AddCollectableSubscriber(EventSource source, string name, Action func)
         {
             WeakEventHandlerManager.Subscribe<EventSource, EventArgs, Subscriber>(source, name, new Subscriber(func).OnEvent);
         }
diff --git a/tests/Avalonia.Base.UnitTests/WeakEventTests.cs b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs
index 2663b4858f..4c9798ef09 100644
--- a/tests/Avalonia.Base.UnitTests/WeakEventTests.cs
+++ b/tests/Avalonia.Base.UnitTests/WeakEventTests.cs
@@ -67,7 +67,7 @@ namespace Avalonia.Base.UnitTests
             Assert.False(handled);
         }
 
-        private void AddSubscriber(EventSource source, Action func)
+        private static void AddSubscriber(EventSource source, Action func)
         {
             EventSource.WeakEv.Subscribe(source, new Subscriber(func));
         }
diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index 9d71e3bffc..4582659763 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -455,7 +455,7 @@ namespace Avalonia.Controls.UnitTests
         /// Creates a large list of strings for AutoCompleteBox testing.
         /// </summary>
         /// <returns>Returns a new List of string values.</returns>
-        private IList<string> CreateSimpleStringArray()
+        private static IList<string> CreateSimpleStringArray()
         {
             return new List<string>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
index a73e14939d..c3acf31caa 100644
--- a/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/CalendarDatePickerTests.cs
@@ -76,7 +76,7 @@ namespace Avalonia.Controls.UnitTests
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             standardCursorFactory: Mock.Of<ICursorFactory>());
 
-        private CalendarDatePicker CreateControl()
+        private static CalendarDatePicker CreateControl()
         {
             var datePicker =
                 new CalendarDatePicker
@@ -88,7 +88,7 @@ namespace Avalonia.Controls.UnitTests
             return datePicker;
         }
 
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<CalendarDatePicker>((control, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
index bd727617be..1a8061bfd9 100644
--- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs
@@ -181,7 +181,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.False(((ILogical)rectangle).IsAttachedToLogicalTree);
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ComboBox>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
index a610224b03..bece711426 100644
--- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
@@ -371,7 +371,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(target, target.Presenter.Child.GetLogicalParent());
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ContentControl>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
index ba80b516a4..d6c521decd 100644
--- a/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs
@@ -593,7 +593,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private Window PreparedWindow(object content = null)
+        private static Window PreparedWindow(object content = null)
         {
             var renderer = new Mock<IRenderer>();
             var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 1cbcbba7de..894dc5b996 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             textShaperImpl: new MockTextShaperImpl());
 
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate((control, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
index 776b4508c2..496b5bc1b6 100644
--- a/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/FlyoutTests.cs
@@ -555,7 +555,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private IDisposable CreateServicesWithFocus()
+        private static IDisposable CreateServicesWithFocus()
         {
             return UnitTestApplication.Start(TestServices.StyledWindow.With(windowingPlatform:
                 new MockWindowingPlatform(null,
@@ -567,7 +567,7 @@ namespace Avalonia.Controls.UnitTests
                     keyboardDevice: () => new KeyboardDevice()));
         }
 
-        private Window PreparedWindow(object content = null)
+        private static Window PreparedWindow(object content = null)
         {
             var renderer = new Mock<IRenderer>();
             var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
@@ -579,7 +579,7 @@ namespace Avalonia.Controls.UnitTests
             return w;
         }
 
-        private PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
+        private static PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
         {
             var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
             return new PointerPressedEventArgs(
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
index c5c7737f0d..8a053c2a91 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTests.cs
@@ -154,7 +154,7 @@ namespace Avalonia.Controls.UnitTests.Generators
             Assert.True(container != null, "The containers is not materialized.");
         }
 
-        private IList<ItemContainerInfo> Materialize(
+        private static IList<ItemContainerInfo> Materialize(
             IItemContainerGenerator generator,
             int index,
             string[] items)
diff --git a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
index aab7c52f34..f63a764a21 100644
--- a/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Generators/ItemContainerGeneratorTypedTests.cs
@@ -23,7 +23,7 @@ namespace Avalonia.Controls.UnitTests.Generators
             Assert.Equal(items, result);
         }
 
-        private IList<ItemContainerInfo> Materialize(
+        private static IList<ItemContainerInfo> Materialize(
             IItemContainerGenerator generator,
             int index,
             string[] items)
diff --git a/tests/Avalonia.Controls.UnitTests/GridTests.cs b/tests/Avalonia.Controls.UnitTests/GridTests.cs
index 4ffa526b85..d372bb2af4 100644
--- a/tests/Avalonia.Controls.UnitTests/GridTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/GridTests.cs
@@ -16,19 +16,19 @@ namespace Avalonia.Controls.UnitTests
             this.output = output;
         }
 
-        private Grid CreateGrid(params (string name, GridLength width)[] columns)
+        private static Grid CreateGrid(params (string name, GridLength width)[] columns)
         {
             return CreateGrid(columns.Select(c =>
                 (c.name, c.width, ColumnDefinition.MinWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray());
         }
 
-        private Grid CreateGrid(params (string name, GridLength width, double minWidth)[] columns)
+        private static Grid CreateGrid(params (string name, GridLength width, double minWidth)[] columns)
         {
             return CreateGrid(columns.Select(c =>
                 (c.name, c.width, c.minWidth, ColumnDefinition.MaxWidthProperty.GetDefaultValue(typeof(ColumnDefinition)))).ToArray());
         }
 
-        private Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns)
+        private static Grid CreateGrid(params (string name, GridLength width, double minWidth, double maxWidth)[] columns)
         {
             var grid = new Grid();
             foreach (var k in columns.Select(c => new ColumnDefinition
diff --git a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs
index 5c86e3e5a9..2cf4148fe3 100644
--- a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs	
+++ b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs	
@@ -58,7 +58,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Empty(target.GetLogicalChildren());
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<HeaderedItemsControl>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ImageTests.cs b/tests/Avalonia.Controls.UnitTests/ImageTests.cs
index ad735cd088..47158f4811 100644
--- a/tests/Avalonia.Controls.UnitTests/ImageTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ImageTests.cs
@@ -164,7 +164,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Size(25, 100), target.Bounds.Size);
         }
 
-        private IBitmap CreateBitmap(int width, int height)
+        private static IBitmap CreateBitmap(int width, int height)
         {
             return Mock.Of<IBitmap>(x => x.Size == new Size(width, height));
         }
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 944f974cb0..f803ea2d53 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -767,7 +767,7 @@ namespace Avalonia.Controls.UnitTests
             public string Value { get; }
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ItemsControl>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index 8cec93da01..2804078861 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -590,7 +590,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new[] { "Bar" }, target.Selection.SelectedItems);
         }
 
-        private FuncControlTemplate ListBoxTemplate()
+        private static FuncControlTemplate ListBoxTemplate()
         {
             return new FuncControlTemplate<ListBox>((parent, scope) =>
                 new ScrollViewer
@@ -607,7 +607,7 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
-        private FuncControlTemplate ListBoxItemTemplate()
+        private static FuncControlTemplate ListBoxItemTemplate()
         {
             return new FuncControlTemplate<ListBoxItem>((parent, scope) =>
                 new ContentPresenter
@@ -618,7 +618,7 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
-        private FuncControlTemplate ScrollViewerTemplate()
+        private static FuncControlTemplate ScrollViewerTemplate()
         {
             return new FuncControlTemplate<ScrollViewer>((parent, scope) =>
                 new Panel
@@ -643,7 +643,7 @@ namespace Avalonia.Controls.UnitTests
                 });
         }
 
-        private void Prepare(ListBox target)
+        private static void Prepare(ListBox target)
         {
             // The ListBox needs to be part of a rooted visual tree.
             var root = new TestRoot();
@@ -718,7 +718,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.True(DataValidationErrors.GetErrors(target).SequenceEqual(new[] { exception }));
         }
 
-        private void RaiseKeyEvent(ListBox listBox, Key key, KeyModifiers inputModifiers = 0)
+        private static void RaiseKeyEvent(ListBox listBox, Key key, KeyModifiers inputModifiers = 0)
         {
             listBox.RaiseEvent(new KeyEventArgs
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
index d946461dfc..87d45fa106 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs
@@ -108,7 +108,7 @@ namespace Avalonia.Controls.UnitTests
             }.RegisterInNameScope(scope);
         }
 
-        private void ApplyTemplate(ListBox target)
+        private static void ApplyTemplate(ListBox target)
         {
             // Apply the template to the ListBox itself.
             target.ApplyTemplate();
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index 3d9da83070..03aac5e2f4 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -339,7 +339,7 @@ namespace Avalonia.Controls.UnitTests
             }.RegisterInNameScope(scope);
         }
 
-        private void ApplyTemplate(ListBox target)
+        private static void ApplyTemplate(ListBox target)
         {
             // Apply the template to the ListBox itself.
             target.ApplyTemplate();
diff --git a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
index 89c31a28c6..90c6fd3b21 100644
--- a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
@@ -118,7 +118,7 @@ namespace Avalonia.Controls.UnitTests
                 target.ApplyTemplate();
                 target.CaretIndex = 3;
                 target.Measure(Size.Infinity);
-                
+
                 RaiseKeyEvent(target, Key.Right, 0);
 
                 Assert.Equal(4, target.CaretIndex);
@@ -885,7 +885,7 @@ namespace Avalonia.Controls.UnitTests
             textShaperImpl: new MockTextShaperImpl(), 
             fontManagerImpl: new MockFontManagerImpl());
 
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<MaskedTextBox>((control, scope) =>
                 new TextPresenter
@@ -908,7 +908,7 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
-        private void RaiseKeyEvent(MaskedTextBox textBox, Key key, KeyModifiers inputModifiers)
+        private static void RaiseKeyEvent(MaskedTextBox textBox, Key key, KeyModifiers inputModifiers)
         {
             textBox.RaiseEvent(new KeyEventArgs
             {
diff --git a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
index d50faf8be9..d8738bf44b 100644
--- a/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.UnitTests
             control.ApplyTemplate();
             return control;
         }
-        private TextBox GetTextBox(NumericUpDown control)
+        private static TextBox GetTextBox(NumericUpDown control)
         {
             return control.GetTemplateChildren()
                           .OfType<ButtonSpinner>()
@@ -76,7 +76,7 @@ namespace Avalonia.Controls.UnitTests
                           .OfType<TextBox>()
                           .First();
         }
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<NumericUpDown>((control, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
index 7ea6d9c588..d3737de45b 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs
@@ -377,7 +377,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             Assert.Equal("Canvas", textBlock.Text);
         }
 
-        (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
+        static (ContentPresenter presenter, ContentControl templatedParent) CreateTarget()
         {
             var templatedParent = new ContentControl
             {
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index 535e181ecd..788e6a48bb 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -327,7 +327,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             }
         }
 
-        private PopupRoot CreateTarget(TopLevel popupParent, IPopupImpl impl = null)
+        private static PopupRoot CreateTarget(TopLevel popupParent, IPopupImpl impl = null)
         {
             impl ??= popupParent.PlatformImpl.CreatePopup();
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index d3a9a7a603..d4193d33ee 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -1075,7 +1075,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
         }
 
        
-        private PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
+        private static PointerPressedEventArgs CreatePointerPressedEventArgs(Window source, Point p)
         {
             var pointer = new Pointer(Pointer.GetNextFreeId(), PointerType.Mouse, true);
             return new PointerPressedEventArgs(
@@ -1088,7 +1088,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 KeyModifiers.None);
         }
 
-        private Window PreparedWindow(object content = null)
+        private static Window PreparedWindow(object content = null)
         {
             var w = new Window { Content = content };
             w.ApplyStyling();
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
index 3c9ca735eb..d2537a0635 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
@@ -119,7 +119,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(new[] { ":selected" }, target.Presenter.Panel.Children[0].Classes);
         }
 
-        private FuncControlTemplate Template()
+        private static FuncControlTemplate Template()
         {
             return new FuncControlTemplate<SelectingItemsControl>((control, scope) =>
                 new ItemsPresenter
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 97f17496ee..bc6147d64c 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -1523,14 +1523,14 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
             Assert.Equal(2, raised);
         }
-        private IEnumerable<int> SelectedContainers(SelectingItemsControl target)
+        private static IEnumerable<int> SelectedContainers(SelectingItemsControl target)
         {
             return target.Presenter.Panel.Children
                 .Select((x, i) => x.Classes.Contains(":selected") ? i : -1)
                 .Where(x => x != -1);
         }
 
-        private FuncControlTemplate Template()
+        private static FuncControlTemplate Template()
         {
             return new FuncControlTemplate<SelectingItemsControl>((control, scope) =>
                 new ItemsPresenter
diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
index cc58297206..3dcbb6caca 100644
--- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs
@@ -421,7 +421,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private IControlTemplate TabControlTemplate()
+        private static IControlTemplate TabControlTemplate()
         {
             return new FuncControlTemplate<TabControl>((parent, scope) =>
                 new StackPanel
@@ -444,7 +444,7 @@ namespace Avalonia.Controls.UnitTests
                 });
         }
 
-        private IControlTemplate TabItemTemplate()
+        private static IControlTemplate TabItemTemplate()
         {
             return new FuncControlTemplate<TabItem>((parent, scope) =>
                 new ContentPresenter
@@ -455,14 +455,14 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
-        private void Prepare(TabControl target)
+        private static void Prepare(TabControl target)
         {
             ApplyTemplate(target);
             target.Measure(Size.Infinity);
             target.Arrange(new Rect(target.DesiredSize));
         }
 
-        private void ApplyTemplate(TabControl target)
+        private static void ApplyTemplate(TabControl target)
         {
             target.ApplyTemplate();
 
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 09d183c115..6b9105ccb5 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -578,7 +578,7 @@ namespace Avalonia.Controls.UnitTests
 
                 target1.Focus();
                 Assert.True(target1.IsFocused);
-                
+
                 RaiseKeyEvent(target1, key, KeyModifiers.None);
             }
         }
@@ -747,7 +747,7 @@ namespace Avalonia.Controls.UnitTests
                     
                     var clipboard = AvaloniaLocator.CurrentMutable.GetService<IClipboard>();
                     clipboard.SetTextAsync(textInput).GetAwaiter().GetResult();
-                    
+
                     RaiseKeyEvent(target, Key.V, KeyModifiers.Control);
                     clipboard.ClearAsync().GetAwaiter().GetResult();
                 }
@@ -1074,7 +1074,7 @@ namespace Avalonia.Controls.UnitTests
                 }.RegisterInNameScope(scope));
         }
 
-        private void RaiseKeyEvent(TextBox textBox, Key key, KeyModifiers inputModifiers)
+        private static void RaiseKeyEvent(TextBox textBox, Key key, KeyModifiers inputModifiers)
         {
             textBox.RaiseEvent(new KeyEventArgs
             {
@@ -1084,7 +1084,7 @@ namespace Avalonia.Controls.UnitTests
             });
         }
 
-        private void RaiseTextEvent(TextBox textBox, string text)
+        private static void RaiseTextEvent(TextBox textBox, string text)
         {
             textBox.RaiseEvent(new TextInputEventArgs
             {
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
index 2b243f7282..bb952ca7e0 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
@@ -90,7 +90,7 @@ namespace Avalonia.Controls.UnitTests
             textShaperImpl: new MockTextShaperImpl(),
             fontManagerImpl: new MockFontManagerImpl());
 
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<TextBox>((control, scope) =>
                 new TextPresenter
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
index 3371cdbdb1..2fd10010a6 100644
--- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -103,7 +103,7 @@ namespace Avalonia.Controls.UnitTests
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             textShaperImpl: new MockTextShaperImpl());
 
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate((control, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
index db6349cc5a..d63251c1f5 100644
--- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs
@@ -307,7 +307,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private FuncControlTemplate<TestTopLevel> CreateTemplate()
+        private static FuncControlTemplate<TestTopLevel> CreateTemplate()
         {
             return new FuncControlTemplate<TestTopLevel>((x, scope) =>
                 new ContentPresenter
diff --git a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
index 6342d9d21f..9cc6c0156b 100644
--- a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.NotNull(target.Template);
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<UserControl>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index 94a596a90c..f367112cc0 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -306,7 +306,7 @@ namespace Avalonia.Controls.UnitTests.Utils
             return button;
         }
 
-        private FuncControlTemplate CreateWindowTemplate()
+        private static FuncControlTemplate CreateWindowTemplate()
         {
             return new FuncControlTemplate<Window>((parent, scope) =>
             {
diff --git a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
index 629408bcba..02ae8b47bc 100644
--- a/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ViewboxTests.cs
@@ -227,8 +227,8 @@ namespace Avalonia.Controls.UnitTests
 
             Assert.Equal("foo", target.Child.DataContext);
         }
-
-        private bool TryGetScale(Viewbox viewbox, out Vector scale)
+      
+        private static bool TryGetScale(Viewbox viewbox, out Vector scale)
         {
             if (viewbox.InternalTransform is null)
             {
diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
index 1b4214e0c7..8f9af52ed8 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
@@ -225,7 +225,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private FuncControlTemplate<TestWindowBase> CreateTemplate()
+        private static FuncControlTemplate<TestWindowBase> CreateTemplate()
         {
             return new FuncControlTemplate<TestWindowBase>((x, scope) =>
                 new ContentPresenter
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 0cdde445d5..bb8a683a60 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -1003,7 +1003,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private IWindowImpl CreateImpl(Mock<IRenderer> renderer)
+        private static IWindowImpl CreateImpl(Mock<IRenderer> renderer)
         {
             return Mock.Of<IWindowImpl>(x =>
                 x.RenderScaling == 1 &&
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index f4a4a2934f..53c186111d 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -123,7 +123,7 @@ namespace Avalonia.Markup.UnitTests.Data
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
-        private WeakReference AssignValue(TestControl source, string val)
+        private static WeakReference AssignValue(TestControl source, string val)
         {
             var obj = new DummyObject(val);
 
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
index 11036e472e..155afb2356 100644
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionNodeBuilderTests.cs
@@ -152,7 +152,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
             Assert.IsType<StreamNode>(result[1]);
         }
 
-        private void AssertIsProperty(ExpressionNode node, string name)
+        private static void AssertIsProperty(ExpressionNode node, string name)
         {
             Assert.IsType<PropertyAccessorNode>(node);
 
@@ -160,7 +160,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
             Assert.Equal(name, p.PropertyName);
         }
 
-        private void AssertIsIndexer(ExpressionNode node, params string[] args)
+        private static void AssertIsIndexer(ExpressionNode node, params string[] args)
         {
             Assert.IsType<StringIndexerNode>(node);
 
@@ -168,7 +168,7 @@ namespace Avalonia.Markup.UnitTests.Parsers
             Assert.Equal(e.Arguments.ToArray(), args);
         }
 
-        private List<ExpressionNode> ToList((ExpressionNode node, SourceMode mode) parsed)
+        private static List<ExpressionNode> ToList((ExpressionNode node, SourceMode mode) parsed)
         {
             var (node, _) = parsed;
             var result = new List<ExpressionNode>();
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
index 20ed22e84f..7bd0ee5f2b 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
@@ -137,7 +135,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             public object Foo { get; } = null;
         }
 
-        private IDisposable StyledWindow(params (string, string)[] assets)
+        private static IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
                 assetLoader: new MockAssetLoader(assets),
@@ -149,7 +147,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
index 8e805d8e5e..16b8bb3f91 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs
@@ -1651,7 +1651,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
         
-        void Throws(string type, Action cb)
+        static void Throws(string type, Action cb)
         {
             try
             {
@@ -1665,8 +1665,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             throw new Exception("Expected " + type);
         }
 
-        void ThrowsXamlParseException(Action cb) => Throws("XamlParseException", cb);
-        void ThrowsXamlTransformException(Action cb) => Throws("XamlTransformException", cb);
+        static void ThrowsXamlParseException(Action cb) => Throws("XamlParseException", cb);
+        static void ThrowsXamlTransformException(Action cb) => Throws("XamlTransformException", cb);
 
 
         static void PerformClick(Button button)
@@ -1674,7 +1674,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             button.RaiseEvent(new KeyEventArgs
             {
                 RoutedEvent = InputElement.KeyDownEvent,
-                Key = Input.Key.Enter,
+                Key = Key.Enter,
             });
         }
     }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
index b9afd5fdba..f1b6963869 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs
@@ -546,7 +546,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             }
         }
 
-        private IDisposable StyledWindow(params (string, string)[] assets)
+        private static IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
                 assetLoader: new MockAssetLoader(assets),
@@ -558,7 +558,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs
index 2a4468a750..2209ff4c83 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs
@@ -12,9 +12,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Parses_Name()
         {
-            var target = new PropertyParser();
             var reader = new CharacterReader("Foo".AsSpan());
-            var (ns, owner, name) = target.Parse(reader);
+            var (ns, owner, name) = PropertyParser.Parse(reader);
 
             Assert.Null(ns);
             Assert.Null(owner);
@@ -24,9 +23,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Parses_Owner_And_Name()
         {
-            var target = new PropertyParser();
             var reader = new CharacterReader("Foo.Bar".AsSpan());
-            var (ns, owner, name) = target.Parse(reader);
+            var (ns, owner, name) = PropertyParser.Parse(reader);
 
             Assert.Null(ns);
             Assert.Equal("Foo", owner);
@@ -36,9 +34,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Parses_Namespace_Owner_And_Name()
         {
-            var target = new PropertyParser();
             var reader = new CharacterReader("foo:Bar.Baz".AsSpan());
-            var (ns, owner, name) = target.Parse(reader);
+            var (ns, owner, name) = PropertyParser.Parse(reader);
 
             Assert.Equal("foo", ns);
             Assert.Equal("Bar", owner);
@@ -48,9 +45,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Parses_Owner_And_Name_With_Parentheses()
         {
-            var target = new PropertyParser();
             var reader = new CharacterReader("(Foo.Bar)".AsSpan());
-            var (ns, owner, name) = target.Parse(reader);
+            var (ns, owner, name) = PropertyParser.Parse(reader);
 
             Assert.Null(ns);
             Assert.Equal("Foo", owner);
@@ -60,9 +56,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Parses_Namespace_Owner_And_Name_With_Parentheses()
         {
-            var target = new PropertyParser();
             var reader = new CharacterReader("(foo:Bar.Baz)".AsSpan());
-            var (ns, owner, name) = target.Parse(reader);
+            var (ns, owner, name) = PropertyParser.Parse(reader);
 
             Assert.Equal("foo", ns);
             Assert.Equal("Bar", owner);
@@ -72,9 +67,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Empty_String()
         {
-            var target = new PropertyParser();
-
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader(ReadOnlySpan<char>.Empty)));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader(ReadOnlySpan<char>.Empty)));
             Assert.Equal(0, ex.Column);
             Assert.Equal("Expected property name.", ex.Message);
         }
@@ -82,9 +75,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Only_Whitespace()
         {
-            var target = new PropertyParser();
-
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("  ".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("  ".AsSpan())));
             Assert.Equal(0, ex.Column);
             Assert.Equal("Unexpected ' '.", ex.Message);
         }
@@ -92,9 +83,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Leading_Whitespace()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader(" Foo".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader(" Foo".AsSpan())));
             Assert.Equal(0, ex.Column);
             Assert.Equal("Unexpected ' '.", ex.Message);
         }
@@ -102,9 +91,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Trailing_Whitespace()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo ".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo ".AsSpan())));
             Assert.Equal(3, ex.Column);
             Assert.Equal("Unexpected ' '.", ex.Message);
         }
@@ -112,9 +99,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Invalid_Property_Name()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("123".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("123".AsSpan())));
             Assert.Equal(0, ex.Column);
             Assert.Equal("Unexpected '1'.", ex.Message);
         }
@@ -122,9 +107,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Trailing_Junk()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo%".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo%".AsSpan())));
             Assert.Equal(3, ex.Column);
             Assert.Equal("Unexpected '%'.", ex.Message);
         }
@@ -132,9 +115,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Invalid_Property_Name_After_Owner()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo.123".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo.123".AsSpan())));
             Assert.Equal(4, ex.Column);
             Assert.Equal("Unexpected '1'.", ex.Message);
         }
@@ -142,9 +123,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Whitespace_Between_Owner_And_Name()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo. Bar".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo. Bar".AsSpan())));
             Assert.Equal(4, ex.Column);
             Assert.Equal("Unexpected ' '.", ex.Message);
         }
@@ -152,9 +131,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Too_Many_Segments()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo.Bar.Baz".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo.Bar.Baz".AsSpan())));
             Assert.Equal(8, ex.Column);
             Assert.Equal("Unexpected '.'.", ex.Message);
         }
@@ -162,9 +139,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Too_Many_Namespaces()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("foo:bar:Baz".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("foo:bar:Baz".AsSpan())));
             Assert.Equal(8, ex.Column);
             Assert.Equal("Unexpected ':'.", ex.Message);
         }
@@ -172,9 +147,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Parens_But_No_Owner()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("(Foo)".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("(Foo)".AsSpan())));
             Assert.Equal(1, ex.Column);
             Assert.Equal("Expected property owner.", ex.Message);
         }
@@ -182,9 +155,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Parens_And_Namespace_But_No_Owner()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("(foo:Bar)".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("(foo:Bar)".AsSpan())));
             Assert.Equal(1, ex.Column);
             Assert.Equal("Expected property owner.", ex.Message);
         }
@@ -192,9 +163,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Missing_Close_Parens()
         {
-            var target = new PropertyParser();
-            
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("(Foo.Bar".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("(Foo.Bar".AsSpan())));
             Assert.Equal(8, ex.Column);
             Assert.Equal("Expected ')'.", ex.Message);
         }
@@ -202,9 +171,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         [Fact]
         public void Fails_With_Unexpected_Close_Parens()
         {
-            var target = new PropertyParser();
-
-            var ex = Assert.Throws<ExpressionParseException>(() => target.Parse(new CharacterReader("Foo.Bar)".AsSpan())));
+            var ex = Assert.Throws<ExpressionParseException>(() => PropertyParser.Parse(new CharacterReader("Foo.Bar)".AsSpan())));
             Assert.Equal(7, ex.Column);
             Assert.Equal("Unexpected ')'.", ex.Message);
         }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
index 77a4932ccc..7530857fb8 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs
@@ -162,7 +162,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
             
         }
 
-        void AssertThrows(Action callback, Func<Exception, bool> check)
+        static void AssertThrows(Action callback, Func<Exception, bool> check)
         {
             try
             {
diff --git a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
index 812290bf33..e1ab54f775 100644
--- a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
+++ b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs
@@ -32,7 +32,7 @@ namespace Avalonia.ReactiveUI.UnitTests
             Assert.IsType<TextBlock>(child);
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ContentControl>((parent, scope) =>
             {
diff --git a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
index 06e46c1a06..f6e7ba0c48 100644
--- a/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
+++ b/tests/Avalonia.RenderTests/Media/GeometryDrawingTests.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         {
         }
 
-        private GeometryDrawing CreateGeometryDrawing()
+        private static GeometryDrawing CreateGeometryDrawing()
         {
             GeometryDrawing geometryDrawing = new GeometryDrawing();
             EllipseGeometry ellipse = new EllipseGeometry();
diff --git a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
index b668f4d39e..f921d9fa64 100644
--- a/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
+++ b/tests/Avalonia.RenderTests/Media/TextFormatting/TextLayoutTests.cs
@@ -39,7 +39,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         {
         }
 
-        private TextLayout Create(string text,
+        private static TextLayout Create(string text,
             string fontFamily,
             double fontSize,
             FontStyle fontStyle,
@@ -56,7 +56,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             return formattedText;
         }
 
-        private TextLayout Create(string text, double fontSize)
+        private static TextLayout Create(string text, double fontSize)
         {
             return Create(text, FontName, fontSize,
                 FontStyle.Normal, TextAlignment.Left,
@@ -64,7 +64,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 -1);
         }
 
-        private TextLayout Create(string text, double fontSize, TextAlignment alignment, double widthConstraint)
+        private static TextLayout Create(string text, double fontSize, TextAlignment alignment, double widthConstraint)
         {
             return Create(text, FontName, fontSize,
                 FontStyle.Normal, alignment,
@@ -72,7 +72,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 widthConstraint);
         }
 
-        private TextLayout Create(string text, double fontSize, TextWrapping wrap, double widthConstraint)
+        private static TextLayout Create(string text, double fontSize, TextWrapping wrap, double widthConstraint)
         {
             return Create(text, FontName, fontSize,
                 FontStyle.Normal, TextAlignment.Left,
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index 4d6b313ffc..3f918e2a73 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -237,7 +237,7 @@ namespace Avalonia.Direct2D1.RenderTests
             return Math.Sqrt(meanSquaresError);
         }
 
-        private string GetTestsDirectory()
+        private static string GetTestsDirectory()
         {
             var path = Directory.GetCurrentDirectory();
 
diff --git a/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs b/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs
index df0cc2fc1a..68595a2f57 100644
--- a/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/DrawingContextImplTests.cs
@@ -21,7 +21,7 @@ namespace Avalonia.Skia.UnitTests
             target.DrawRectangle(Brushes.Black, new Pen(Brushes.Black, 0), new RoundedRect(new Rect(0, 0, 100, 100), new CornerRadius(4)));
         }
 
-        private DrawingContextImpl CreateTarget()
+        private static DrawingContextImpl CreateTarget()
         {
             var canvas = new SKCanvas(new SKBitmap(100, 100));
             return (DrawingContextImpl)DrawingContextHelper.WrapSkiaCanvas(canvas, new Vector(96, 96));