feat(tests): Address rule CA1822

tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs

@@ -889,7 +889,7 @@ namespace Avalonia.Base.UnitTests
         /// <typeparam name="T">The type of the observable.</typeparam>
         /// <param name="value">The value.</param>
         /// <returns>The observable.</returns>
-        private IObservable<T> Single<T>(T value)
+        private static IObservable<T> Single<T>(T value)
         {
             return Observable.Never<T>().StartWith(value);
         }

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));
         }

tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs

@@ -713,7 +713,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));
         }

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

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,

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,

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

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);
         }

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);
     }
 }

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>();

tests/Avalonia.Base.UnitTests/RenderTests_Culling.cs

@@ -179,7 +179,7 @@ namespace Avalonia.Base.UnitTests
             ImmediateRenderer.Render(control, ctx);
         }
 
-        private DrawingContext CreateDrawingContext()
+        private static DrawingContext CreateDrawingContext()
         {
             return new DrawingContext(Mock.Of<IDrawingContextImpl>());
         }

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);
     }

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

@@ -745,7 +745,7 @@ namespace Avalonia.Base.UnitTests.Rendering
             return target;
         }
 
-        private Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
+        private static Mock<IDrawingContextImpl> GetLayerContext(DeferredRenderer renderer, IControl layerRoot)
         {
             return Mock.Get(renderer.Layers[layerRoot].Bitmap.Item.CreateDrawingContext(null));
         }

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);
         }

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);
         }

tests/Avalonia.Base.UnitTests/Styling/SelectorTests_Template.cs

@@ -151,7 +151,7 @@ namespace Avalonia.Base.UnitTests.Styling
             Assert.Equal(0, ((Classes)styleable.Object.Classes).ListenerCount);
         }
 
-        private void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
+        private static void BuildVisualTree<T>(Mock<T> templatedControl) where T : class, IVisual
         {
             templatedControl.Setup(x => x.VisualChildren).Returns(new Controls.Controls
             {

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

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);
         }

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);
         }

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));
         }

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

tests/Avalonia.Controls.UnitTests/ContentControlTests.cs

@@ -368,7 +368,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ContentControl>((parent, scope) =>
             {

tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs

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

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

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(

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)

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)

tests/Avalonia.Controls.UnitTests/GridTests.cs

@@ -28,7 +28,7 @@ namespace Avalonia.Controls.UnitTests
                 (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

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

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));
         }

tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs

@@ -747,7 +747,7 @@ namespace Avalonia.Controls.UnitTests
             public string Value { get; }
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<ItemsControl>((parent, scope) =>
             {

tests/Avalonia.Controls.UnitTests/ListBoxTests.cs

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

tests/Avalonia.Controls.UnitTests/ListBoxTests_Multiple.cs

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

tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs

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

tests/Avalonia.Controls.UnitTests/NumericUpDownTests.cs

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

tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs

@@ -376,7 +376,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
             {

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

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

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

@@ -1087,7 +1087,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.ApplyTemplate();

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

@@ -118,7 +118,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

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

tests/Avalonia.Controls.UnitTests/TabControlTests.cs

@@ -425,7 +425,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private IControlTemplate TabControlTemplate()
+        private static IControlTemplate TabControlTemplate()
         {
             return new FuncControlTemplate<TabControl>((parent, scope) =>
                 new StackPanel
@@ -448,7 +448,7 @@ namespace Avalonia.Controls.UnitTests
                 });
         }
 
-        private IControlTemplate TabItemTemplate()
+        private static IControlTemplate TabItemTemplate()
         {
             return new FuncControlTemplate<TabItem>((parent, scope) =>
                 new ContentPresenter
@@ -459,14 +459,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();
 

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

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

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

tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@@ -1293,12 +1293,12 @@ namespace Avalonia.Controls.UnitTests
             };
         }
 
-        private void CreateNodeDataTemplate(IControl control)
+        private static void CreateNodeDataTemplate(IControl control)
         {
             control.DataTemplates.Add(new TestTreeDataTemplate());
         }
 
-        private IControlTemplate CreateTreeViewTemplate()
+        private static IControlTemplate CreateTreeViewTemplate()
         {
             return new FuncControlTemplate<TreeView>((parent, scope) => new ItemsPresenter
             {
@@ -1307,7 +1307,7 @@ namespace Avalonia.Controls.UnitTests
             }.RegisterInNameScope(scope));
         }
 
-        private IControlTemplate CreateTreeViewItemTemplate()
+        private static IControlTemplate CreateTreeViewItemTemplate()
         {
             return new FuncControlTemplate<TreeViewItem>((parent, scope) => new Panel
             {
@@ -1327,7 +1327,7 @@ namespace Avalonia.Controls.UnitTests
             });
         }
 
-        private void ExpandAll(TreeView tree)
+        private static void ExpandAll(TreeView tree)
         {
             foreach (var i in tree.ItemContainerGenerator.Containers)
             {
@@ -1373,7 +1373,7 @@ namespace Avalonia.Controls.UnitTests
             _mouse.Click(container, modifiers: modifiers);
         }
 
-        private void AssertChildrenSelected(TreeView treeView, Node rootNode)
+        private static void AssertChildrenSelected(TreeView treeView, Node rootNode)
         {
             foreach (var child in rootNode.Children)
             {
@@ -1383,7 +1383,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private IDisposable Application()
+        private static IDisposable Application()
         {
             return UnitTestApplication.Start(
                 TestServices.MockThreadingInterface.With(

tests/Avalonia.Controls.UnitTests/UserControlTests.cs

@@ -35,7 +35,7 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        private FuncControlTemplate GetTemplate()
+        private static FuncControlTemplate GetTemplate()
         {
             return new FuncControlTemplate<UserControl>((parent, scope) =>
             {

tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs

@@ -321,7 +321,7 @@ namespace Avalonia.Controls.UnitTests.Utils
             return button;
         }
 
-        private FuncControlTemplate CreateWindowTemplate()
+        private static FuncControlTemplate CreateWindowTemplate()
         {
             return new FuncControlTemplate<Window>((parent, scope) =>
             {

tests/Avalonia.Controls.UnitTests/ViewboxTests.cs

@@ -207,7 +207,7 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(new Size(200, 200), target.DesiredSize);
         }
 
-        private bool TryGetScale(Viewbox viewbox, out Vector scale)
+        private static bool TryGetScale(Viewbox viewbox, out Vector scale)
         {
             if (viewbox.InternalTransform is null)
             {

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

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

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

tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs

@@ -43,7 +43,7 @@ namespace Avalonia.Markup.UnitTests.Data
             Assert.Equal("Goodbye cruel world :(", target.Text);
         }
 
-        private Mock<IControl> CreateTarget(
+        private static Mock<IControl> CreateTarget(
             ITemplatedControl templatedParent = null,
             string text = null)
         {

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>();

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

@@ -17,7 +17,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void BindingExtension_Binds_To_Source()
         {
-            using (StyledWindow())
+            using (BindingExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -41,7 +41,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void BindingExtension_Binds_To_TargetNullValue()
         {
-            using (StyledWindow())
+            using (BindingExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -66,7 +66,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
         [Fact]
         public void BindingExtension_TargetNullValue_UnsetByDefault()
         {
-            using (StyledWindow())
+            using (BindingExtensionTests.StyledWindow())
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
@@ -137,19 +137,19 @@ 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),
                 theme: () => new Styles
                 {
-                    WindowStyle(),
+                    BindingExtensionTests.WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {

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

@@ -894,13 +894,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 assetLoader: new MockAssetLoader(assets),
                 theme: () => new Styles
                 {
-                    WindowStyle(),
+                    DynamicResourceExtensionTests.WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {

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

@@ -20,7 +20,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <SolidColorBrush x:Key='brush'>#ff506070</SolidColorBrush>
 </ResourceDictionary>
 ";
-                using (StartWithResources(("test:include.xaml", includeXaml)))
+                using (StaticResourceExtensionTests.StartWithResources(("test:include.xaml", includeXaml)))
                 {
                     var xaml = @"
 <UserControl xmlns='https://github.com/avaloniaui'
@@ -53,7 +53,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
     <StaticResource x:Key='brush' ResourceKey='missing' />
 </ResourceDictionary>";
 
-                using (StartWithResources(("test:style.xaml", styleXaml)))
+                using (StaticResourceExtensionTests.StartWithResources(("test:style.xaml", styleXaml)))
                 {
                     var xaml = @"
 <Application xmlns='https://github.com/avaloniaui'
@@ -80,7 +80,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 }
             }
 
-            private IDisposable StartWithResources(params (string, string)[] assets)
+            private static IDisposable StartWithResources(params (string, string)[] assets)
             {
                 var assetLoader = new MockAssetLoader(assets);
                 var services = new TestServices(assetLoader: assetLoader);

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

@@ -546,13 +546,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                 assetLoader: new MockAssetLoader(assets),
                 theme: () => new Styles
                 {
-                    WindowStyle(),
+                    StaticResourceExtensionTests.WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {

tests/Avalonia.Markup.Xaml.UnitTests/Parsers/PropertyParserTests.cs

@@ -14,7 +14,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
@@ -26,7 +26,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
@@ -38,7 +38,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
@@ -50,7 +50,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
@@ -62,7 +62,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
@@ -74,7 +74,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -84,7 +84,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -94,7 +94,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -104,7 +104,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -114,7 +114,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -124,7 +124,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -134,7 +134,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -144,7 +144,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -154,7 +154,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -164,7 +164,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -174,7 +174,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -184,7 +184,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -194,7 +194,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }
@@ -204,7 +204,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Parsers
         {
             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);
         }

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

@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
     </Style.Resources>
 </Style>";
 
-            using (StartWithResources(("test:style.xaml", styleXaml)))
+            using (StyleIncludeTests.StartWithResources(("test:style.xaml", styleXaml)))
             {
                 var xaml = @"
 <Application xmlns='https://github.com/avaloniaui'
@@ -41,7 +41,7 @@ namespace Avalonia.Markup.Xaml.UnitTests
             }
         }
 
-        private IDisposable StartWithResources(params (string, string)[] assets)
+        private static IDisposable StartWithResources(params (string, string)[] assets)
         {
             var assetLoader = new MockAssetLoader(assets);
             var services = new TestServices(assetLoader: assetLoader);

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

@@ -279,13 +279,13 @@ namespace Avalonia.Markup.Xaml.UnitTests.Xaml
                 assetLoader: new MockAssetLoader(assets),
                 theme: () => new Styles
                 {
-                    WindowStyle(),
+                    ResourceDictionaryTests.WindowStyle(),
                 });
 
             return UnitTestApplication.Start(services);
         }
 
-        private Style WindowStyle()
+        private static Style WindowStyle()
         {
             return new Style(x => x.OfType<Window>())
             {

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

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

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();

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,

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();
 

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