fix: Address CA1822 rule

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -131,10 +131,10 @@ namespace Avalonia.Win32
         internal static Compositor Compositor { get; private set; }
 
         public Size DoubleClickSize => new Size(
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CXDOUBLECLK),
-            UnmanagedMethods.GetSystemMetrics(UnmanagedMethods.SystemMetric.SM_CYDOUBLECLK));
+            GetSystemMetrics(SystemMetric.SM_CXDOUBLECLK),
+            GetSystemMetrics(SystemMetric.SM_CYDOUBLECLK));
 
-        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(UnmanagedMethods.GetDoubleClickTime());
+        public TimeSpan DoubleClickTime => TimeSpan.FromMilliseconds(GetDoubleClickTime());
 
         /// <inheritdoc cref="IPlatformSettings.TouchDoubleClickSize"/>
         public Size TouchDoubleClickSize => new Size(16,16);
@@ -185,16 +185,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
             {
@@ -208,10 +208,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)
             {
@@ -225,7 +225,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,
@@ -237,7 +237,7 @@ namespace Avalonia.Win32
             return Disposable.Create(() =>
             {
                 _delegates.Remove(timerDelegate);
-                UnmanagedMethods.KillTimer(IntPtr.Zero, handle);
+                KillTimer(IntPtr.Zero, handle);
             });
         }
 
@@ -246,9 +246,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));
         }
@@ -262,7 +262,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);
             }
@@ -284,7 +284,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()
@@ -296,18 +296,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)
             {

src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs

@@ -356,7 +356,7 @@ namespace Avalonia.Win32
                                     RawPointerEventType.XButton1Down :
                                     RawPointerEventType.XButton2Down,
                             },
-                            PointToClient(PointFromLParam(lParam)), GetMouseModifiers(wParam));
+                            PointToClient(WindowImpl.PointFromLParam(lParam)), GetMouseModifiers(wParam));
                         break;
                     }
                 case WindowsMessage.WM_TOUCH:
@@ -948,7 +948,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));
         }

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)
                             {

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -639,7 +639,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;
         }
 
@@ -1321,12 +1321,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);

src/tools/DevGenerators/CompositionGenerator/Generator.cs

@@ -311,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);
@@ -344,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;
@@ -371,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
@@ -404,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}"")
@@ -435,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(
@@ -446,7 +446,7 @@ return;
             return body;
         }
         
-        private BlockSyntax SerializeChangesPrologue(GClass cl)
+        private static BlockSyntax SerializeChangesPrologue(GClass cl)
         {
             return Block(
                 ParseStatement("base.SerializeChangesCore(writer);"),
@@ -454,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);
@@ -478,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);
@@ -487,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 = "";
@@ -514,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;
@@ -526,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;

tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs

@@ -171,7 +171,7 @@ namespace Avalonia.Base.UnitTests
             }
         }
 
-        private void Render(IControl control)
+        private static void Render(IControl control)
         {
             var ctx = CreateDrawingContext();
             control.Measure(Size.Infinity);

tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests.cs

@@ -726,7 +726,7 @@ namespace Avalonia.Base.UnitTests.Rendering
             }
         }
 
-        private DeferredRenderer CreateTargetAndRunFrame(
+        private static DeferredRenderer CreateTargetAndRunFrame(
             TestRoot root,
             Mock<IRenderTimer> timer = null,
             ISceneBuilder sceneBuilder = null,
@@ -750,25 +750,25 @@ namespace Avalonia.Base.UnitTests.Rendering
             return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
         }
 
-        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
+        private static void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
         {
             RunFrame(task);
             sceneBuilder.Invocations.Clear();
         }
 
-        private void RunFrame(IRenderLoopTask task)
+        private static void RunFrame(IRenderLoopTask task)
         {
             task.Update(TimeSpan.Zero);
             task.Render();
         }
 
-        private IRenderTargetBitmapImpl CreateLayer()
+        private static IRenderTargetBitmapImpl CreateLayer()
         {
             return Mock.Of<IRenderTargetBitmapImpl>(x =>
                 x.CreateDrawingContext(It.IsAny<IVisualBrushRenderer>()) == Mock.Of<IDrawingContextImpl>());
         }
 
-        private Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
+        private static Mock<ISceneBuilder> MockSceneBuilder(IRenderRoot root)
         {
             var result = new Mock<ISceneBuilder>();
             result.Setup(x => x.UpdateAll(It.IsAny<Scene>()))

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>
             {

tests/Avalonia.Controls.UnitTests/ButtonTests.cs

@@ -379,7 +379,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private KeyEventArgs CreateKeyDownEvent(Key key, IInteractive source = null)
+        private static KeyEventArgs CreateKeyDownEvent(Key key, IInteractive source = null)
         {
             return new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, Source = source };
         }

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) =>
             {

tests/Avalonia.Controls.UnitTests/GridTests.cs

@@ -16,13 +16,13 @@ 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());

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
@@ -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
             {

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
             {

tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs

@@ -75,7 +75,7 @@ namespace Avalonia.Controls.UnitTests
                           .OfType<TextBox>()
                           .First();
         }
-        private IControlTemplate CreateTemplate()
+        private static IControlTemplate CreateTemplate()
         {
             return new FuncControlTemplate<NumericUpDown>((control, scope) =>
             {

tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs

@@ -1074,7 +1074,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(

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();
                 }
@@ -904,7 +904,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
             {
@@ -914,7 +914,7 @@ namespace Avalonia.Controls.UnitTests
             });
         }
 
-        private void RaiseTextEvent(TextBox textBox, string text)
+        private static void RaiseTextEvent(TextBox textBox, string text)
         {
             textBox.RaiseEvent(new TextInputEventArgs
             {

tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@@ -1247,7 +1247,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private TreeViewItem GetItem(TreeView target, params int[] indexes)
+        private static TreeViewItem GetItem(TreeView target, params int[] indexes)
         {
             var c = (ItemsControl)target;
 

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/CompiledBindingExtensionTests.cs

@@ -1568,8 +1568,8 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 Assert.Equal(typeof(string), node.Property.PropertyType);
             }
         }
-        
-        void Throws(string type, Action cb)
+
+        static void Throws(string type, Action cb)
         {
             try
             {
@@ -1583,8 +1583,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)
@@ -1592,7 +1592,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             button.RaiseEvent(new KeyEventArgs
             {
                 RoutedEvent = InputElement.KeyDownEvent,
-                Key = Input.Key.Enter,
+                Key = Key.Enter,
             });
         }
     }

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs

@@ -221,7 +221,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void DynamicResource_From_Style_Can_Be_Assigned_To_Setter()
         {
-            using (StyledWindow())
+            using (DynamicResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -262,7 +262,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     </Style>
 </Styles>";
 
-            using (StyledWindow(assets: ("test:style.xaml", styleXaml)))
+            using (DynamicResourceExtensionTests.StyledWindow(assets: ("test:style.xaml", styleXaml)))
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -300,7 +300,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     </Style>
 </Styles>";
 
-            using (StyledWindow(assets: ("test:style.xaml", styleXaml)))
+            using (DynamicResourceExtensionTests.StyledWindow(assets: ("test:style.xaml", styleXaml)))
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -567,7 +567,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <SolidColorBrush x:Key='RedBrush' Color='{DynamicResource Red}'/>
   </Style.Resources>
 </Style>";
-            using (StyledWindow(
+            using (DynamicResourceExtensionTests.StyledWindow(
                 ("test:style1.xaml", style1Xaml), 
                 ("test:style2.xaml", style2Xaml)))
             {
@@ -606,7 +606,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <SolidColorBrush x:Key='RedBrush' Color='{DynamicResource Red}'/>
   </Style.Resources>
 </Style>";
-            using (StyledWindow(
+            using (DynamicResourceExtensionTests.StyledWindow(
                 ("test:style1.xaml", style1Xaml),
                 ("test:style2.xaml", style2Xaml)))
             {
@@ -631,7 +631,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void Control_Property_Is_Updated_When_Parent_Is_Changed()
         {
-            using (StyledWindow())
+            using (DynamicResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -813,7 +813,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void Resource_In_Non_Matching_Style_Is_Not_Resolved()
         {
-            using var app = StyledWindow();
+            using var app = DynamicResourceExtensionTests.StyledWindow();
 
             var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -852,7 +852,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void Resource_In_Non_Active_Style_Is_Not_Resolved()
         {
-            using var app = StyledWindow();
+            using var app = DynamicResourceExtensionTests.StyledWindow();
 
             var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -888,13 +888,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
             Assert.DoesNotContain("foo", resourceProvider.RequestedResources);
         }
 
-        private IDisposable StyledWindow(params (string, string)[] assets)
+        private static IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
                 assetLoader: new MockAssetLoader(assets),
                 theme: () => new Styles
                 {
-                    DynamicResourceExtensionTests.WindowStyle(),
+                    WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs

@@ -374,7 +374,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void StaticResource_Can_Be_Assigned_To_Converter()
         {
-            using (StyledWindow())
+            using (StaticResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -400,7 +400,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void StaticResource_Can_Be_Assigned_To_Binding_Converter_In_DataTemplate()
         {
-            using (StyledWindow())
+            using (StaticResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -435,7 +435,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         {
             // this tests if IAmbientProviders in DataTemplate contexts are in correct order
             // if they wouldn't be, Purple brush would be bound to
-            using (StyledWindow())
+            using (StaticResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -516,7 +516,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void Automatically_Converts_Color_To_SolidColorBrush_From_Setter()
         {
-            using (StyledWindow())
+            using (StaticResourceExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -540,13 +540,13 @@ 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),
                 theme: () => new Styles
                 {
-                    StaticResourceExtensionTests.WindowStyle(),
+                    WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/ResourceDictionaryTests.cs

@@ -15,7 +15,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void StaticResource_Works_In_ResourceDictionary()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
@@ -39,7 +39,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
   <SolidColorBrush x:Key='RedBrush' Color='{DynamicResource Red}'/>
 </ResourceDictionary>";
 
-            using (StyledWindow(assets: ("test:dict.xaml", dictionaryXaml)))
+            using (ResourceDictionaryTests.StyledWindow(assets: ("test:dict.xaml", dictionaryXaml)))
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -70,7 +70,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Is_Added_To_ResourceDictionary_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
@@ -86,7 +86,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Added_To_ResourceDictionary_Is_UnDeferred_On_Read()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
@@ -106,7 +106,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Is_Added_To_Window_Resources_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -125,7 +125,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Is_Added_To_Window_MergedDictionaries_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -150,7 +150,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Is_Added_To_Style_Resources_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Style xmlns='https://github.com/avaloniaui'
@@ -169,7 +169,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Is_Added_To_Styles_Resources_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Styles xmlns='https://github.com/avaloniaui'
@@ -188,7 +188,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_Can_Be_StaticReferenced_As_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -214,7 +214,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Item_StaticReferenced_Is_UnDeferred_On_Read()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -242,7 +242,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Value_Type_With_Parse_Converter_Should_Not_Be_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
@@ -259,7 +259,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
         [Fact]
         public void Value_Type_With_Ctor_Converter_Should_Not_Be_Deferred()
         {
-            using (StyledWindow())
+            using (ResourceDictionaryTests.StyledWindow())
             {
                 var xaml = @"
 <ResourceDictionary xmlns='https://github.com/avaloniaui'
@@ -273,7 +273,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
             }
         }
 
-        private IDisposable StyledWindow(params (string, string)[] assets)
+        private static IDisposable StyledWindow(params (string, string)[] assets)
         {
             var services = TestServices.StyledWindow.With(
                 assetLoader: new MockAssetLoader(assets),

tests/Avalonia.Markup.Xaml.UnitTests/Xaml/XamlIlTests.cs

@@ -182,7 +182,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
         public void Bug2570()
         {
             SomeStaticProperty = "123";
-            XamlIlTests.AssertThrows(() => AvaloniaRuntimeXamlLoader
+            AssertThrows(() => AvaloniaRuntimeXamlLoader
                     .Load(@"
 <UserControl 
     xmlns='https://github.com/avaloniaui'