Merge pull request #4880 from workgroupengineering/features/zerowarnings_miscellaneous

Features zerowarnings: Changes which obviously don't affect functionality
5 years ago · 6adb3eaa63
57 changed files with 225 additions and 292 deletions
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -31,6 +31,8 @@ jobs:
    condition: not(canceled())
     
 - job: macOS
+  variables:
+    SolutionDir: '$(Build.SourcesDirectory)'
  pool:
    vmImage: 'macOS-10.14'
  steps:
@ -97,6 +99,8 @@ jobs:
 - job: Windows
  pool:
    vmImage: 'windows-2019'
+  variables:
+    SolutionDir: '$(Build.SourcesDirectory)'
  steps:
  - task: UseDotNet@2
    displayName: 'Use .NET Core SDK 3.1.401'
--- a/build/Assets/Icon.png
+++ b/build/Assets/Icon.png
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
@ -10,10 +10,14 @@
    <NoWarn>CS1591</NoWarn>
    <LangVersion>latest</LangVersion>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageIconUrl>https://avatars2.githubusercontent.com/u/14075148?s=200</PackageIconUrl>
+    <PackageIcon>Icon.png</PackageIcon>
    <PackageDescription>Avalonia is a WPF/UWP-inspired cross-platform XAML-based UI framework providing a flexible styling system and supporting a wide range of Operating Systems such as Windows (.NET Framework, .NET Core), Linux (via Xorg), MacOS and with experimental support for Android and iOS.</PackageDescription>
    <PackageTags>avalonia;avaloniaui;mvvm;rx;reactive extensions;android;ios;mac;forms;wpf;net;netstandard;net461;uwp;xamarin</PackageTags>
    <PackageReleaseNotes>https://github.com/AvaloniaUI/Avalonia/releases</PackageReleaseNotes>
    <RepositoryType>git</RepositoryType>
  </PropertyGroup>
+
+  <ItemGroup Label="PackageIcon">
+    <None Include="$(SolutionDir)/build/Assets/Icon.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
 </Project>
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@ -1,5 +1,5 @@
 <Project>
  <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.3" PrivateAssets="All" />
  </ItemGroup>
-</Project>
+</Project>
--- a/dirs.proj
+++ b/dirs.proj
@ -21,6 +21,7 @@
  <ItemGroup Condition="!$([MSBuild]::IsOsPlatform('Windows')) OR '$(MSBuildRuntimeType)' != 'Full'">
    <ProjectReference Remove="src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj" />
    <ProjectReference Remove="samples/interop/**/*.*proj" />
+    <ProjectReference Remove="samples/ControlCatalog.Desktop/*.*proj" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/BindingDemo/App.xaml.cs
+++ b/samples/BindingDemo/App.xaml.cs
@ -1,6 +1,5 @@
-using System;
 using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

@ -13,13 +12,20 @@ namespace BindingDemo
            AvaloniaXamlLoader.Load(this);
        }

-        private static void Main()
+        public override void OnFrameworkInitializationCompleted()
        {
-            AppBuilder.Configure<App>()
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
                .UsePlatformDetect()
                .UseReactiveUI()
-                .LogToDebug()
-                .Start<MainWindow>();
-        }
+                .LogToDebug();
    }
 }
--- a/samples/ControlCatalog.Desktop/Program.cs
+++ b/samples/ControlCatalog.Desktop/Program.cs
@ -10,12 +10,8 @@ namespace ControlCatalog
    internal class Program
    {
        [STAThread]
-        static void Main(string[] args)
-        {
-            // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
-            // again.
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);

        /// <summary>
        /// This method is needed for IDE previewer infrastructure
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@ -11,7 +11,6 @@
    <ProjectReference Include="..\..\src\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
    <ProjectReference Include="..\..\src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj" />
    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
  </ItemGroup>
--- a/samples/Previewer/App.xaml.cs
+++ b/samples/Previewer/App.xaml.cs
@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;

 namespace Previewer
@ -9,6 +10,13 @@ namespace Previewer
        {
            AvaloniaXamlLoader.Load(this);
        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
    }

-}
+}
--- a/samples/Previewer/Program.cs
+++ b/samples/Previewer/Program.cs
@ -1,13 +1,14 @@
-using System;
-using Avalonia;
+using Avalonia;

 namespace Previewer
 {
    class Program
    {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>().UsePlatformDetect().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>()
+                .UsePlatformDetect();
+
+        public static int Main(string[] args)
+          => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
    }
-}
+}
--- a/samples/RenderDemo/App.xaml.cs
+++ b/samples/RenderDemo/App.xaml.cs
@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;

@ -11,9 +12,17 @@ namespace RenderDemo
            AvaloniaXamlLoader.Load(this);
        }

+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
+
        // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
        // again.
-        static void Main(string[] args) => BuildAvaloniaApp().Start<MainWindow>();
+        static void Main(string[] args) 
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);

        // App configuration, used by the entry point and previewer
        static AppBuilder BuildAvaloniaApp()
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml
@ -6,9 +6,9 @@
             x:Class="RenderDemo.Pages.GlyphRunPage">
  <Border
    Background="White">
-    <DrawingPresenter
-      x:Name="drawingPresenter"
+    <Image
+      x:Name="imageControl"
      Stretch="None">
-    </DrawingPresenter>
+    </Image>
  </Border>
 </UserControl>
--- a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
+++ b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
@ -9,7 +9,7 @@ namespace RenderDemo.Pages
 {
    public class GlyphRunPage : UserControl
    {
-        private DrawingPresenter _drawingPresenter;
+        private Image _imageControl;
        private GlyphTypeface _glyphTypeface = Typeface.Default.GlyphTypeface;
        private readonly Random _rand = new Random();
        private ushort[] _glyphIndices = new ushort[1];
@ -25,7 +25,8 @@ namespace RenderDemo.Pages
        {
            AvaloniaXamlLoader.Load(this);

-            _drawingPresenter = this.FindControl<DrawingPresenter>("drawingPresenter");
+            _imageControl = this.FindControl<Image>("imageControl");
+            _imageControl.Source = new DrawingImage();

            DispatcherTimer.Run(() =>
            {
@ -73,7 +74,7 @@ namespace RenderDemo.Pages

            drawingGroup.Children.Add(geometryDrawing);

-            _drawingPresenter.Drawing = drawingGroup;
+            (_imageControl.Source as DrawingImage).Drawing = drawingGroup;
        }
    }
 }
--- a/samples/VirtualizationDemo/App.xaml.cs
+++ b/samples/VirtualizationDemo/App.xaml.cs
@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;

 namespace VirtualizationDemo
@ -9,5 +10,12 @@ namespace VirtualizationDemo
        {
            AvaloniaXamlLoader.Load(this);
        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
    }
 }
--- a/samples/VirtualizationDemo/Program.cs
+++ b/samples/VirtualizationDemo/Program.cs
@ -1,19 +1,17 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia;
 using Avalonia.ReactiveUI;

 namespace VirtualizationDemo
 {
    class Program
    {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-               .UsePlatformDetect()
-               .UseReactiveUI()
-               .LogToDebug()
-               .Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .UsePlatformDetect()
+                .UseReactiveUI()
+                .LogToDebug();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
    }
 }
--- a/samples/interop/Direct3DInteropSample/App.paml.cs
+++ b/samples/interop/Direct3DInteropSample/App.paml.cs
@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;

 namespace Direct3DInteropSample
@ -9,5 +10,12 @@ namespace Direct3DInteropSample
        {
            AvaloniaXamlLoader.Load(this);
        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
    }
 }
--- a/samples/interop/Direct3DInteropSample/Program.cs
+++ b/samples/interop/Direct3DInteropSample/Program.cs
@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
+using Avalonia;

 namespace Direct3DInteropSample
 {
    class Program
    {
-        static void Main(string[] args)
-        {
-            AppBuilder.Configure<App>()
-                .With(new Win32PlatformOptions {UseDeferredRendering = false})
-                .UseWin32().UseDirect2D1().Start<MainWindow>();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+            => AppBuilder.Configure<App>()
+                .With(new Win32PlatformOptions { UseDeferredRendering = false })
+                .UseWin32()
+                .UseDirect2D1();
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
    }
 }
--- a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
+++ b/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
@ -9,7 +9,6 @@

  <ItemGroup>
    <PackageReference Include="MonoMac.NetStandard" Version="0.0.4" />
-    <ProjectReference Include="..\..\..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
    <ProjectReference Include="..\..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
    <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
    <ProjectReference Include="..\..\..\src\Avalonia.X11\Avalonia.X11.csproj" />
--- a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@ -665,6 +665,7 @@ namespace Avalonia.Controls
        /// <param name="dataItem">
        /// The data item represented by the row that contains the intended cell.
        /// </param>
+        /// <param name="binding">When the method returns, contains the applied binding.</param>
        /// <returns>
        /// A new editing element that is bound to the column's <see cref="P:Avalonia.Controls.DataGridBoundColumn.Binding" /> property value.
        /// </returns>
--- a/src/Avalonia.Controls/Primitives/IPopupHost.cs
+++ b/src/Avalonia.Controls/Primitives/IPopupHost.cs
@ -47,6 +47,7 @@ namespace Avalonia.Controls.Primitives
        /// <param name="offset">The offset, in device-independent pixels.</param>
        /// <param name="anchor">The anchor point.</param>
        /// <param name="gravity">The popup gravity.</param>
+        /// <param name="constraintAdjustment">Defines how a popup position will be adjusted if the unadjusted position would result in the popup being partly constrained.</param>
        /// <param name="rect">
        /// The anchor rect. If null, the bounds of <paramref name="target"/> will be used.
        /// </param>
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@ -451,7 +451,7 @@ namespace Avalonia.Controls
        /// </summary>
        /// <param name="dialogResult">The dialog result.</param>
        /// <remarks>
-        /// When the window is shown with the <see cref="ShowDialog{TResult}(IWindowImpl)"/>
+        /// When the window is shown with the <see cref="ShowDialog{TResult}(Window)"/>
        /// or <see cref="ShowDialog{TResult}(Window)"/> method, the
        /// resulting task will produce the <see cref="_dialogResult"/> value when the window
        /// is closed.
--- a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
@ -99,7 +99,6 @@ namespace Avalonia.Media.Imaging
        /// Initializes a new instance of the <see cref="Bitmap"/> class.
        /// </summary>
        /// <param name="format">The pixel format.</param>
-        /// <param name="alphaFormat">The alpha format.</param>
        /// <param name="data">The pointer to the source bytes.</param>
        /// <param name="size">The size of the bitmap in device pixels.</param>
        /// <param name="dpi">The DPI of the bitmap.</param>
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@ -69,7 +69,7 @@ namespace Avalonia.Platform
        /// If the pen is null, then no stoke is performed. If both the pen and the brush are null, then the drawing is not visible.
        /// </remarks>
        void DrawRectangle(IBrush brush, IPen pen, RoundedRect rect,
-            BoxShadows boxShadow = default);
+            BoxShadows boxShadows = default);

        /// <summary>
        /// Draws text.
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
@ -13,10 +13,9 @@ namespace Avalonia.Rendering.SceneGraph
        /// <summary>
        /// Initializes a new instance of the <see cref="RectangleNode"/> class.
        /// </summary>
-        /// <param name="transform">The transform.</param>        
+        /// <param name="transform">The transform.</param>
+        /// <param name="material"></param>        
        /// <param name="rect">The rectangle to draw.</param>
-        /// <param name="boxShadow">The box shadow parameters</param>
-        /// <param name="childScenes">Child scenes for drawing visual brushes.</param>
        public ExperimentalAcrylicNode(
            Matrix transform,
            IExperimentalAcrylicMaterial material,
@ -44,7 +43,7 @@ namespace Avalonia.Rendering.SceneGraph
        /// Determines if this draw operation equals another.
        /// </summary>
        /// <param name="transform">The transform of the other draw operation.</param>
-        /// <param name="brush">The fill of the other draw operation.</param>
+        /// <param name="material">The fill of the other draw operation.</param>
        /// <param name="rect">The rectangle of the other draw operation.</param>        
        /// <returns>True if the draw operations are the same, otherwise false.</returns>
        /// <remarks>
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
@ -63,7 +63,6 @@ namespace Avalonia.Rendering.SceneGraph
        /// <param name="brush">The fill of the other draw operation.</param>
        /// <param name="pen">The stroke of the other draw operation.</param>
        /// <param name="geometry">The geometry of the other draw operation.</param>
-        /// <param name="boxShadow">The box shadow parameters</param>
        /// <returns>True if the draw operations are the same, otherwise false.</returns>
        /// <remarks>
        /// The properties of the other draw operation are passed in as arguments to prevent
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
@ -73,7 +73,7 @@ namespace Avalonia.Rendering.SceneGraph
        /// <param name="brush">The fill of the other draw operation.</param>
        /// <param name="pen">The stroke of the other draw operation.</param>
        /// <param name="rect">The rectangle of the other draw operation.</param>
-        /// <param name="boxShadow">The box shadow parameters of the other draw operation</param>
+        /// <param name="boxShadows">The box shadow parameters of the other draw operation</param>
        /// <returns>True if the draw operations are the same, otherwise false.</returns>
        /// <remarks>
        /// The properties of the other draw operation are passed in as arguments to prevent
--- a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
@ -113,22 +113,22 @@ namespace Avalonia.LinuxFramebuffer.Output
        [StructLayout(LayoutKind.Sequential)]
        public struct drmModeConnector {
            public uint connector_id;
-            public uint encoder_id; /**< Encoder currently connected to */
+            public uint encoder_id; // Encoder currently connected to 
            public uint connector_type;
            public uint connector_type_id;
            public DrmModeConnection connection;
-            public uint mmWidth, mmHeight; /**< HxW in millimeters */
+            public uint mmWidth, mmHeight; //  HxW in millimeters 
            public DrmModeSubPixel subpixel;

            public int count_modes;
            public drmModeModeInfo* modes;

            public int count_props;
-            public uint *props; /**< List of property ids */
-            public ulong *prop_values; /**< List of property values */
+            public uint *props; // List of property ids 
+            public ulong *prop_values; // List of property values 

            public int count_encoders;
-            public uint *encoders; /**< List of encoder ids */
+            public uint *encoders; //List of encoder ids
        }
        
        [StructLayout(LayoutKind.Sequential)]
@ -143,14 +143,14 @@ namespace Avalonia.LinuxFramebuffer.Output
        [StructLayout(LayoutKind.Sequential)]
        public struct drmModeCrtc {
            public uint crtc_id;
-            public uint buffer_id; /**< FB id to connect to 0 = disconnect */
+            public uint buffer_id; // FB id to connect to 0 = disconnect 

-            public uint x, y; /**< Position on the framebuffer */
+            public uint x, y; // Position on the framebuffer 
            public uint width, height;
            public int mode_valid;
            public drmModeModeInfo mode;

-            public int gamma_size; /**< Number of gamma stops */
+            public int gamma_size; // Number of gamma stops 

        }
        
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs
@ -3,7 +3,6 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using Avalonia.Markup.Xaml.XamlIl;
-// ReSharper disable CheckNamespace

 namespace Avalonia.Markup.Xaml
 {
@ -13,10 +12,10 @@ namespace Avalonia.Markup.Xaml
        /// Loads XAML from a string.
        /// </summary>
        /// <param name="xaml">The string containing the XAML.</param>
-        /// <param name="localAssembly">Default assembly for clr-namespace:</param>
-        /// <param name="rootInstance">
-        /// The optional instance into which the XAML should be loaded.
-        /// </param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:.</param>
+        /// <param name="rootInstance">The optional instance into which the XAML should be loaded.</param>
+        /// <param name="uri">The URI of the XAML being loaded.</param>
+        /// <param name="designMode">Indicates whether the XAML is being loaded in design mode.</param>
        /// <returns>The loaded object.</returns>
        public static object Load(string xaml, Assembly localAssembly = null, object rootInstance = null, Uri uri = null, bool designMode = false)
        {
@ -28,13 +27,35 @@ namespace Avalonia.Markup.Xaml
            }
        }

+        /// <summary>
+        /// Loads XAML from a stream.
+        /// </summary>
+        /// <param name="stream">The stream containing the XAML.</param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:</param>
+        /// <param name="rootInstance">The optional instance into which the XAML should be loaded.</param>
+        /// <param name="uri">The URI of the XAML being loaded.</param>
+        /// <param name="designMode">Indicates whether the XAML is being loaded in design mode.</param>
+        /// <returns>The loaded object.</returns>
        public static object Load(Stream stream, Assembly localAssembly, object rootInstance = null, Uri uri = null,
            bool designMode = false)
            => AvaloniaXamlIlRuntimeCompiler.Load(stream, localAssembly, rootInstance, uri, designMode);

+        /// <summary>
+        /// Parse XAML from a string.
+        /// </summary>
+        /// <param name="xaml">The string containing the XAML.</param>
+        /// <param name="localAssembly">Default assembly for clr-namespace:.</param>
+        /// <returns>The loaded object.</returns>
        public static object Parse(string xaml, Assembly localAssembly = null)
            => Load(xaml, localAssembly);

+        /// <summary>
+        /// Parse XAML from a string.
+        /// </summary>
+        /// <typeparam name="T">The type of the returned object.</typeparam>
+        /// <param name="xaml">>The string containing the XAML.</param>
+        /// <param name="localAssembly">>Default assembly for clr-namespace:.</param>
+        /// <returns>The loaded object.</returns>
        public static T Parse<T>(string xaml, Assembly localAssembly = null)
            => (T)Parse(xaml, localAssembly);
            
--- a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
@ -323,7 +323,6 @@ namespace Avalonia.Direct2D1.Media
        /// </summary>
        /// <param name="foreground">The foreground.</param>
        /// <param name="glyphRun">The glyph run.</param>
-        /// <param name="baselineOrigin"></param>
        public void DrawGlyphRun(IBrush foreground, GlyphRun glyphRun)
        {
            using (var brush = CreateBrush(foreground, glyphRun.Size))
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+    <UseWpf>true</UseWpf>
    <ExtrasEnableImplicitWinFormsReferences>true</ExtrasEnableImplicitWinFormsReferences>
    <UseDirect3D9>true</UseDirect3D9>
    <PackageId>Avalonia.Win32.Interoperability</PackageId>
--- a/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs
+++ b/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs
@ -13,6 +13,7 @@ namespace Avalonia.Win32.Interop
        /// <summary>
        /// Ported from https://github.com/chromium/chromium/blob/master/ui/views/win/fullscreen_handler.cc
        /// </summary>
+        /// <param name="hwnd">The window handle.</param>
        /// <param name="fullscreen">Fullscreen state.</param>
        public static unsafe void MarkFullscreen(IntPtr hwnd, bool fullscreen)
        {
--- a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
+++ b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
@ -113,7 +113,7 @@ namespace Avalonia.Animation.UnitTests
                It.IsAny<IClock>(),
                1.0,
                0.5));
-            target.ResetCalls();
+            target.Invocations.Clear();

            control.SetValue(Visual.OpacityProperty, 0.8, BindingPriority.StyleTrigger);

@ -135,7 +135,7 @@ namespace Avalonia.Animation.UnitTests
            target.Setup(x => x.Apply(control, It.IsAny<IClock>(), 1.0, 0.5)).Returns(sub.Object);

            control.Opacity = 0.5;
-            sub.ResetCalls();
+            sub.Invocations.Clear();
            control.Opacity = 0.4;

            sub.Verify(x => x.Dispose());
@ -158,7 +158,7 @@ namespace Avalonia.Animation.UnitTests
            control.Opacity = 0.5;

            Assert.Equal(0.9, control.Opacity);
-            target.ResetCalls();
+            target.Invocations.Clear();

            control.Opacity = 0.4;

@ -182,7 +182,7 @@ namespace Avalonia.Animation.UnitTests
                It.IsAny<IClock>(),
                1.0,
                0.5));
-            target.ResetCalls();
+            target.Invocations.Clear();

            var root = (TestRoot)control.Parent;
            root.Child = null;
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
@ -67,7 +67,7 @@ namespace Avalonia.Base.UnitTests
            public static readonly DirectProperty<Class1, string> DirectProperty =
                AvaloniaProperty.RegisterDirect<Class1, string>("Styled", o => o.Direct, unsetValue: "foo");

-            private string _direct;
+            private string _direct = default;

            public string Direct
            {
@ -92,7 +92,7 @@ namespace Avalonia.Base.UnitTests
            public static readonly DirectProperty<Class3, string> DirectProperty =
                Class1.DirectProperty.AddOwner<Class3>(o => o.Direct, unsetValue: "baz");

-            private string _direct;
+            private string _direct = default;

            static Class3()
            {
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
@ -6,10 +6,12 @@ namespace Avalonia.Base.UnitTests.Collections
 {
    public class AvaloniaListExtenionsTests
    {
+#pragma warning disable CS0618 // Type or member is obsolete
        [Fact]
        public void CreateDerivedList_Creates_Initial_Items()
        {
            var source = new AvaloniaList<int>(new[] { 0, 1, 2, 3 });
+
            var target = source.CreateDerivedList(x => new Wrapper(x));
            var result = target.Select(x => x.Value).ToList();

@ -137,6 +139,8 @@ namespace Avalonia.Base.UnitTests.Collections

            Assert.Equal(source, result);
        }
+#pragma warning restore CS0618 // Type or member is obsolete
+

        private class Wrapper
        {
--- a/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
@ -356,7 +356,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
        }

        [Fact]
-        public async Task Null_Value_Should_Use_TargetNullValue()
+        public void Null_Value_Should_Use_TargetNullValue()
        {
            var data = new Class1 { StringValue = "foo" };

--- a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
@ -1,12 +1,11 @@
+using System;
+using System.ComponentModel;
 using System.Globalization;
-using Avalonia.Controls;
-using Avalonia.Data;
-using Xunit;
 using System.Windows.Input;
-using System;
+using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Layout;
-using System.ComponentModel;
+using Xunit;

 namespace Avalonia.Base.UnitTests.Data.Converters
 {
@ -251,6 +250,11 @@ namespace Avalonia.Base.UnitTests.Data.Converters
            {
                return obj is CustomType other && this.Value == other.Value;
            }
+
+            public override int GetHashCode()
+            {
+                return 8399587^Value.GetHashCode();
+            }
        }

        private class CustomTypeConverter : TypeConverter
--- a/tests/Avalonia.Benchmarks/NullRenderer.cs
+++ b/tests/Avalonia.Benchmarks/NullRenderer.cs
@ -9,8 +9,9 @@ namespace Avalonia.Benchmarks
    {
        public bool DrawFps { get; set; }
        public bool DrawDirtyRects { get; set; }
+#pragma warning disable CS0067
        public event EventHandler<SceneInvalidatedEventArgs> SceneInvalidated;
-
+#pragma warning restore CS0067
        public void AddDirty(IVisual visual)
        {
        }
--- a/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs
+++ b/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs
@ -23,6 +23,9 @@ namespace Avalonia.Benchmarks

        public bool CurrentThreadIsLoopThread => true;

+#pragma warning disable CS0067
        public event Action<DispatcherPriority?> Signaled;
+#pragma warning restore CS0067
+
    }
 }
--- a/tests/Avalonia.Controls.UnitTests/BorderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
@ -54,7 +54,7 @@ namespace Avalonia.Controls.UnitTests

            var root = new TestRoot(target);
            var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();

            ((SolidColorBrush)target.Background).Color = Colors.Green;

--- a/tests/Avalonia.Controls.UnitTests/PanelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
@ -127,7 +127,7 @@ namespace Avalonia.Controls.UnitTests

            var root = new TestRoot(target);
            var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();

            ((SolidColorBrush)target.Background).Color = Colors.Green;

--- a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
@ -503,26 +503,26 @@ namespace Avalonia.Controls.UnitTests.Platform
                target.PointerEnter(item, enter);
                Assert.True(timer.ActionIsQueued);
                Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
-                Mock.Get(parentItem).ResetCalls();
+                Mock.Get(parentItem).Invocations.Clear();

                // SubMenu shown after a delay.
                timer.Pulse();
                Mock.Get(item).Verify(x => x.Open());
                Mock.Get(item).SetupGet(x => x.IsSubMenuOpen).Returns(true);
-                Mock.Get(item).ResetCalls();
+                Mock.Get(item).Invocations.Clear();

                // Pointer briefly exits item, but submenu remains open.
                target.PointerLeave(item, leave);
                Mock.Get(item).Verify(x => x.Close(), Times.Never);
-                Mock.Get(item).ResetCalls();
+                Mock.Get(item).Invocations.Clear();

                // Pointer enters child item; is selected.
                enter.Source = childItem;
                target.PointerEnter(childItem, enter);
                Mock.Get(item).VerifySet(x => x.SelectedItem = childItem);
                Mock.Get(parentItem).VerifySet(x => x.SelectedItem = item);
-                Mock.Get(item).ResetCalls();
-                Mock.Get(parentItem).ResetCalls();
+                Mock.Get(item).Invocations.Clear();
+                Mock.Get(parentItem).Invocations.Clear();
            }

            [Fact]
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
@ -212,7 +212,7 @@ namespace Avalonia.Controls.UnitTests.Presenters

            var root = new TestRoot(target);
            var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();

            ((SolidColorBrush)target.Background).Color = Colors.Green;

--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@ -37,7 +37,7 @@ namespace Avalonia.Controls.UnitTests

            var root = new TestRoot(target);
            var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();

            ((SolidColorBrush)target.Background).Color = Colors.Green;

@ -54,7 +54,7 @@ namespace Avalonia.Controls.UnitTests

            var root = new TestRoot(target);
            var renderer = Mock.Get(root.Renderer);
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();

            ((SolidColorBrush)target.Foreground).Color = Colors.Green;

--- a/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;

 namespace Avalonia.DesignerSupport.TestApp
@ -13,5 +9,12 @@ namespace Avalonia.DesignerSupport.TestApp
        {
            AvaloniaXamlLoader.Load(this);
        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.MainWindow = new MainWindow();
+            base.OnFrameworkInitializationCompleted();
+        }
    }
 }
--- a/tests/Avalonia.DesignerSupport.TestApp/Program.cs
+++ b/tests/Avalonia.DesignerSupport.TestApp/Program.cs
@ -1,24 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-
-namespace Avalonia.DesignerSupport.TestApp
+namespace Avalonia.DesignerSupport.TestApp
 {
    static class Program
    {
        /// <summary>
        /// The main entry point for the application.
        /// </summary>
-        static void Main()
-        {
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);

-        private static AppBuilder BuildAvaloniaApp()
-        {
-            return AppBuilder.Configure<App>().UsePlatformDetect();
-        }
+        public static AppBuilder BuildAvaloniaApp()
+          => AppBuilder.Configure<App>().UsePlatformDetect();
    }
 }
--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
@ -112,7 +112,7 @@ namespace Avalonia.Layout.UnitTests

            root.Measure(Size.Infinity);
            root.Arrange(new Rect(root.DesiredSize));
-            target.ResetCalls();
+            target.Invocations.Clear();

            control.InvalidateMeasure();
            control.InvalidateMeasure();
@ -133,7 +133,7 @@ namespace Avalonia.Layout.UnitTests

            root.Measure(Size.Infinity);
            root.Arrange(new Rect(root.DesiredSize));
-            target.ResetCalls();
+            target.Invocations.Clear();

            control.InvalidateArrange();
            control.InvalidateArrange();
@ -163,7 +163,7 @@ namespace Avalonia.Layout.UnitTests
            Assert.False(control.IsMeasureValid);
            Assert.True(root.IsMeasureValid);

-            target.ResetCalls();
+            target.Invocations.Clear();

            root.Child = control;

--- a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
+++ b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
@ -15,7 +15,9 @@ namespace Avalonia.Layout.UnitTests
        [Fact]
        public async Task EffectiveViewportChanged_Not_Raised_When_Control_Added_To_Tree()
        {
+#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
            await RunOnUIThread.Execute(async () =>
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
            {
                var root = CreateRoot();
                var target = new Canvas();
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@ -460,7 +460,7 @@ namespace Avalonia.LeakTests
                
                AttachShowAndDetachContextMenu(window);

-                Mock.Get(window.PlatformImpl).ResetCalls();
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
                dotMemory.Check(memory =>
                    Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
                dotMemory.Check(memory =>
@ -505,7 +505,7 @@ namespace Avalonia.LeakTests
                BuildAndShowContextMenu(window);
                BuildAndShowContextMenu(window);

-                Mock.Get(window.PlatformImpl).ResetCalls();
+                Mock.Get(window.PlatformImpl).Invocations.Clear();
                dotMemory.Check(memory =>
                    Assert.Equal(initialMenuCount, memory.GetObjects(where => where.Type.Is<ContextMenu>()).ObjectsCount));
                dotMemory.Check(memory =>
@ -601,8 +601,9 @@ namespace Avalonia.LeakTests
        {
            public bool DrawFps { get; set; }
            public bool DrawDirtyRects { get; set; }
+#pragma warning disable CS0067
            public event EventHandler<SceneInvalidatedEventArgs> SceneInvalidated;
-
+#pragma warning restore CS0067
            public void AddDirty(IVisual visual)
            {
            }
--- a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
@ -168,10 +168,23 @@ namespace Avalonia.Markup.UnitTests.Parsers

        private class Test : INotifyDataErrorInfo
        {
+            private string _dataValidationError;
+
            public bool Foo { get; set; }
            public object Bar { get; set; }

-            public string DataValidationError { get; set; }
+            public string DataValidationError
+            {
+                get => _dataValidationError;
+                set
+                {
+                    if (value == _dataValidationError)
+                        return;
+                    _dataValidationError = value;
+                    ErrorsChanged?
+                        .Invoke(this, new DataErrorsChangedEventArgs(nameof(DataValidationError)));
+                }
+            }
            public bool HasErrors => !string.IsNullOrWhiteSpace(DataValidationError);

            public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
--- a/tests/Avalonia.RenderTests/Media/BitmapTests.cs
+++ b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
@ -102,7 +102,9 @@ namespace Avalonia.Direct2D1.RenderTests.Media
        [InlineData(PixelFormat.Bgra8888), InlineData(PixelFormat.Rgba8888)]
        public void WriteableBitmapShouldBeUsable(PixelFormat fmt)
        {
+#pragma warning disable CS0618 // Type or member is obsolete
            var writeableBitmap = new WriteableBitmap(new PixelSize(256, 256), new Vector(96, 96), fmt);
+#pragma warning restore CS0618 // Type or member is obsolete

            var data = new int[256 * 256];
            for (int y = 0; y < 256; y++)
--- a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
@ -108,7 +108,7 @@ namespace Avalonia.Styling.UnitTests
            var target = new ResourceDictionary { { "foo", "bar" } };

            ((IResourceProvider)target).AddOwner(host.Object);
-            host.ResetCalls();
+            host.Invocations.Clear();
            ((IResourceProvider)target).RemoveOwner(host.Object);

            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
@ -120,7 +120,7 @@ namespace Avalonia.Styling.UnitTests
            var host = new Mock<IResourceHost>();
            var target = new ResourceDictionary(host.Object);

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.Add("foo", "bar");

            host.Verify(x => x.NotifyHostedResourcesChanged(It.IsAny<ResourcesChangedEventArgs>()));
@ -132,7 +132,7 @@ namespace Avalonia.Styling.UnitTests
            var host = new Mock<IResourceHost>();
            var target = new ResourceDictionary(host.Object);

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.MergedDictionaries.Add(new ResourceDictionary
            {
                { "foo", "bar" },
@ -149,7 +149,7 @@ namespace Avalonia.Styling.UnitTests
            var host = new Mock<IResourceHost>();
            var target = new ResourceDictionary(host.Object);

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.MergedDictionaries.Add(new ResourceDictionary());

            host.Verify(
@ -169,7 +169,7 @@ namespace Avalonia.Styling.UnitTests
                }
            };

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.MergedDictionaries.RemoveAt(0);

            host.Verify(
@ -189,7 +189,7 @@ namespace Avalonia.Styling.UnitTests
                }
            };

-            host.ResetCalls();
+            host.Invocations.Clear();
            ((IResourceDictionary)target.MergedDictionaries[0]).Add("foo", "bar");

            host.Verify(
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
@ -1,12 +1,7 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Xunit;

@ -85,76 +80,6 @@ namespace Avalonia.Styling.UnitTests
                get => Parent;
                set => ((ISetLogicalParent)this).SetParent(value);
            }
-
-            public void ClearValue(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(AvaloniaProperty<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void AddInheritanceChild(IAvaloniaObject child)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RemoveInheritanceChild(IAvaloniaObject child)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void InheritanceParentChanged<T>(StyledPropertyBase<T> property, IAvaloniaObject oldParent, IAvaloniaObject newParent)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void InheritedPropertyChanged<T>(AvaloniaProperty<T> property, Optional<T> oldValue, Optional<T> newValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(StyledPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(DirectPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(StyledPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(DirectPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(DirectPropertyBase<T> property, T value)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(StyledPropertyBase<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(DirectPropertyBase<T> property, IObservable<BindingValue<T>> source)
-            {
-                throw new NotImplementedException();
-            }
        }

        public class TestLogical1 : TestLogical
--- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
+++ b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
@ -1,11 +1,7 @@
-using System;
 using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.LogicalTree;
 using Xunit;

@ -115,76 +111,6 @@ namespace Avalonia.Styling.UnitTests
                get => Parent;
                set => ((ISetLogicalParent)this).SetParent(value);
            }
-
-            public void ClearValue(AvaloniaProperty property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(AvaloniaProperty<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void AddInheritanceChild(IAvaloniaObject child)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void RemoveInheritanceChild(IAvaloniaObject child)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void InheritanceParentChanged<T>(StyledPropertyBase<T> property, IAvaloniaObject oldParent, IAvaloniaObject newParent)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void InheritedPropertyChanged<T>(AvaloniaProperty<T> property, Optional<T> oldValue, Optional<T> newValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(StyledPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void ClearValue<T>(DirectPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(StyledPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public T GetValue<T>(DirectPropertyBase<T> property)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(StyledPropertyBase<T> property, T value, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void SetValue<T>(DirectPropertyBase<T> property, T value)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(StyledPropertyBase<T> property, IObservable<BindingValue<T>> source, BindingPriority priority = BindingPriority.LocalValue)
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDisposable Bind<T>(DirectPropertyBase<T> property, IObservable<BindingValue<T>> source)
-            {
-                throw new NotImplementedException();
-            }
        }

        public class TestLogical1 : TestLogical
--- a/tests/Avalonia.Styling.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
@ -443,7 +443,7 @@ namespace Avalonia.Styling.UnitTests
            var resources = new Mock<IResourceDictionary>();
            target.Resources = resources.Object;

-            host.ResetCalls();
+            host.Invocations.Clear();
            ((IResourceProvider)target).AddOwner(host.Object);
            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
        }
--- a/tests/Avalonia.Styling.UnitTests/StylesTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
@ -15,7 +15,7 @@ namespace Avalonia.Styling.UnitTests
            var style = new Mock<IStyle>();
            var rp = style.As<IResourceProvider>();

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.Add(style.Object);

            rp.Verify(x => x.AddOwner(host.Object));
@ -29,7 +29,7 @@ namespace Avalonia.Styling.UnitTests
            var style = new Mock<IStyle>();
            var rp = style.As<IResourceProvider>();

-            host.ResetCalls();
+            host.Invocations.Clear();
            target.Add(style.Object);
            target.Remove(style.Object);

@ -58,7 +58,7 @@ namespace Avalonia.Styling.UnitTests
            var resources = new Mock<IResourceDictionary>();
            target.Resources = resources.Object;

-            host.ResetCalls();
+            host.Invocations.Clear();
            ((IResourceProvider)target).AddOwner(host.Object);
            resources.Verify(x => x.AddOwner(host.Object), Times.Once);
        }
@ -87,7 +87,7 @@ namespace Avalonia.Styling.UnitTests
            var resourceProvider = style.As<IResourceProvider>();
            target.Add(style.Object);

-            host.ResetCalls();
+            host.Invocations.Clear();
            ((IResourceProvider)target).AddOwner(host.Object);
            resourceProvider.Verify(x => x.AddOwner(host.Object), Times.Once);
        }
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
@ -756,7 +756,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering
        private void IgnoreFirstFrame(IRenderLoopTask task, Mock<ISceneBuilder> sceneBuilder)
        {
            RunFrame(task);
-            sceneBuilder.ResetCalls();
+            sceneBuilder.Invocations.Clear();
        }

        private void RunFrame(IRenderLoopTask task)
--- a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
@ -173,7 +173,7 @@ namespace Avalonia.Visuals.UnitTests
            };

            root.Child = child;
-            renderer.ResetCalls();
+            renderer.Invocations.Clear();
            root.Child = null;

            renderer.Verify(x => x.AddDirty(child));