From 919c1edde4e7be6716023204df3547b1b0c9d49a Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 10:30:45 +0200
Subject: [PATCH 1/7] Remove warning sample

---
 samples/BindingDemo/App.xaml.cs               | 20 +++++++++++-------
 samples/ControlCatalog.Desktop/Program.cs     |  8 ++-----
 .../ControlCatalog.NetCore.csproj             |  1 -
 samples/Previewer/App.xaml.cs                 | 10 ++++++++-
 samples/Previewer/Program.cs                  | 15 ++++++-------
 samples/RenderDemo/App.xaml.cs                | 11 +++++++++-
 samples/RenderDemo/Pages/GlyphRunPage.xaml    |  6 +++---
 samples/RenderDemo/Pages/GlyphRunPage.xaml.cs |  7 ++++---
 samples/VirtualizationDemo/App.xaml.cs        |  8 +++++++
 samples/VirtualizationDemo/Program.cs         | 20 ++++++++----------
 .../interop/Direct3DInteropSample/App.paml.cs |  8 +++++++
 .../interop/Direct3DInteropSample/Program.cs  | 21 ++++++++-----------
 .../NativeEmbedSample.csproj                  |  1 -
 13 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/samples/BindingDemo/App.xaml.cs b/samples/BindingDemo/App.xaml.cs
index 13875aeb21..5c38ab8305 100644
--- 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();
     }
 }
diff --git a/samples/ControlCatalog.Desktop/Program.cs b/samples/ControlCatalog.Desktop/Program.cs
index b2df1953f5..e0cc8cc904 100644
--- 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
diff --git a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
index 28b0257eda..2752703e21 100644
--- 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>
diff --git a/samples/Previewer/App.xaml.cs b/samples/Previewer/App.xaml.cs
index fffa987a27..ab83d45cd3 100644
--- 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();
+        }
     }
 
-}
\ No newline at end of file
+}
diff --git a/samples/Previewer/Program.cs b/samples/Previewer/Program.cs
index 48363e27f2..b12b93974a 100644
--- 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);
     }
-}
\ No newline at end of file
+}
diff --git a/samples/RenderDemo/App.xaml.cs b/samples/RenderDemo/App.xaml.cs
index 340ccdae19..2247fd7c5a 100644
--- 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()
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml b/samples/RenderDemo/Pages/GlyphRunPage.xaml
index fb3e318a0e..c2914e8847 100644
--- 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>
diff --git a/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs b/samples/RenderDemo/Pages/GlyphRunPage.xaml.cs
index ddee880288..857358f6b2 100644
--- 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;
         }
     }
 }
diff --git a/samples/VirtualizationDemo/App.xaml.cs b/samples/VirtualizationDemo/App.xaml.cs
index 5990dd282c..81b80c1f40 100644
--- 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();
+        }
     }
 }
diff --git a/samples/VirtualizationDemo/Program.cs b/samples/VirtualizationDemo/Program.cs
index 93ea5e1b88..c23bfd7ad9 100644
--- 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);
     }
 }
diff --git a/samples/interop/Direct3DInteropSample/App.paml.cs b/samples/interop/Direct3DInteropSample/App.paml.cs
index 1b6d5fd39c..29365decfe 100644
--- 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();
+        }
     }
 }
diff --git a/samples/interop/Direct3DInteropSample/Program.cs b/samples/interop/Direct3DInteropSample/Program.cs
index 21302fa68a..bf8e76d7e4 100644
--- 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);
     }
 }
diff --git a/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj b/samples/interop/NativeEmbedSample/NativeEmbedSample.csproj
index cc831ef8ae..0e0e71fbb2 100644
--- 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" />

From a6c705bf70f56389392fadabff43e05b3010f143 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 10:35:18 +0200
Subject: [PATCH 2/7] Update XML Comment

---
 .../DataGridColumn.cs                         |  1 +
 .../Primitives/IPopupHost.cs                  |  1 +
 src/Avalonia.Controls/Window.cs               |  2 +-
 src/Avalonia.Visuals/Media/Imaging/Bitmap.cs  |  1 -
 .../Platform/IDrawingContextImpl.cs           |  2 +-
 .../SceneGraph/ExperimentalAcrylicNode.cs     |  7 ++---
 .../Rendering/SceneGraph/GeometryNode.cs      |  1 -
 .../Rendering/SceneGraph/RectangleNode.cs     |  2 +-
 .../Avalonia.LinuxFramebuffer/Output/Drm.cs   | 16 +++++-----
 .../AvaloniaRuntimeXamlLoader.cs              | 31 ++++++++++++++++---
 .../Media/DrawingContextImpl.cs               |  1 -
 .../Avalonia.Win32/Interop/TaskBarList.cs     |  1 +
 12 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
index 23c4acdf6c..92ddd4e736 100644
--- 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>
diff --git a/src/Avalonia.Controls/Primitives/IPopupHost.cs b/src/Avalonia.Controls/Primitives/IPopupHost.cs
index 82a49c4189..ab81fe869e 100644
--- 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>
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 317b6d3f2e..54574a7e1c 100644
--- 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.
diff --git a/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs b/src/Avalonia.Visuals/Media/Imaging/Bitmap.cs
index ca303211cd..5a0c57b333 100644
--- 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>
diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index cfe2cf979a..9cf4e62030 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -63,7 +63,7 @@ namespace Avalonia.Platform
         /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
         /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
         /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="boxShadows">Box shadow effect parameters</param>
+        /// <param name="boxShadow">Box shadow effect parameters</param>
         /// <remarks>
         /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
         /// 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.
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/ExperimentalAcrylicNode.cs
index 336d11e3fd..8bd079d070 100644
--- 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>
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/GeometryNode.cs
index 8a19679c77..508ca0ad18 100644
--- 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
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/RectangleNode.cs
index ec1a7753b1..d0c4566485 100644
--- 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
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs b/src/Linux/Avalonia.LinuxFramebuffer/Output/Drm.cs
index 787a2e4cb8..9c476b1b63 100644
--- 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 
 
         }
         
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/AvaloniaRuntimeXamlLoader.cs
index 4569970d01..4df07bcdd8 100644
--- 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);
             
diff --git a/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/DrawingContextImpl.cs
index 59292d605c..ace658654d 100644
--- 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))
diff --git a/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs b/src/Windows/Avalonia.Win32/Interop/TaskBarList.cs
index 1b01ebbe7f..88b907aeec 100644
--- 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)
         {

From c98918bc2afc97da3692a616bf5e74db393523a9 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 10:38:17 +0200
Subject: [PATCH 3/7] Update tests

---
 .../AnimatableTests.cs                        |  8 +-
 .../AvaloniaObjectTests_Metadata.cs           |  4 +-
 .../Collections/AvaloniaListExtenionsTests.cs |  4 +
 .../Data/Core/BindingExpressionTests.cs       |  2 +-
 .../Data/DefaultValueConverterTests.cs        | 14 ++--
 tests/Avalonia.Benchmarks/NullRenderer.cs     |  3 +-
 .../NullThreadingPlatform.cs                  |  3 +
 .../BorderTests.cs                            |  2 +-
 .../Avalonia.Controls.UnitTests/PanelTests.cs |  2 +-
 .../DefaultMenuInteractionHandlerTests.cs     | 10 +--
 .../ContentPresenterTests_Standalone.cs       |  2 +-
 .../TextBlockTests.cs                         |  4 +-
 .../App.xaml.cs                               | 13 ++--
 .../Program.cs                                | 20 ++---
 .../LayoutableTests.cs                        |  6 +-
 ...ayoutableTests_EffectiveViewportChanged.cs |  2 +
 tests/Avalonia.LeakTests/ControlTests.cs      |  7 +-
 ...ExpressionObserverBuilderTests_Negation.cs | 15 +++-
 .../Avalonia.RenderTests/Media/BitmapTests.cs |  2 +
 .../ResourceDictionaryTests.cs                | 12 +--
 .../SelectorTests_Child.cs                    | 75 -------------------
 .../SelectorTests_Descendent.cs               | 74 ------------------
 .../Avalonia.Styling.UnitTests/StyleTests.cs  |  2 +-
 .../Avalonia.Styling.UnitTests/StylesTests.cs |  8 +-
 .../Rendering/DeferredRendererTests.cs        |  2 +-
 .../Avalonia.Visuals.UnitTests/VisualTests.cs |  2 +-
 26 files changed, 86 insertions(+), 212 deletions(-)

diff --git a/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs b/tests/Avalonia.Animation.UnitTests/AnimatableTests.cs
index 784f40fe1f..7633a761a3 100644
--- 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;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Metadata.cs
index 161911dfd5..2edb3deff0 100644
--- 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()
             {
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaListExtenionsTests.cs
index 7f118a2c1d..b1b2d3d8f2 100644
--- 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
         {
diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
index 1e1f4bd4b2..339cf8a334 100644
--- 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" };
 
diff --git a/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
index efa81dcc1b..f522acf9ce 100644
--- 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
diff --git a/tests/Avalonia.Benchmarks/NullRenderer.cs b/tests/Avalonia.Benchmarks/NullRenderer.cs
index 9a756aaf0b..c1701b5d57 100644
--- 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)
         {
         }
diff --git a/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs b/tests/Avalonia.Benchmarks/NullThreadingPlatform.cs
index ba84b5afcc..bb469a6b33 100644
--- 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
+
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/BorderTests.cs b/tests/Avalonia.Controls.UnitTests/BorderTests.cs
index 6e2599c9fd..ab33eaaff9 100644
--- 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;
 
diff --git a/tests/Avalonia.Controls.UnitTests/PanelTests.cs b/tests/Avalonia.Controls.UnitTests/PanelTests.cs
index 79ee6d1236..f189638c7d 100644
--- 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;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs b/tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
index 64f35049ce..1a11091b81 100644
--- 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]
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs
index c0440ebc7b..c7aa583b6f 100644
--- 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;
 
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index 2d2c197220..b180a536a5 100644
--- 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;
 
diff --git a/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs b/tests/Avalonia.DesignerSupport.TestApp/App.xaml.cs
index 653a51232b..97b6b9021a 100644
--- 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();
+        }
     }
 }
diff --git a/tests/Avalonia.DesignerSupport.TestApp/Program.cs b/tests/Avalonia.DesignerSupport.TestApp/Program.cs
index c7c60a4eca..b8428511b3 100644
--- 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();
     }
 }
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests.cs
index 44a5af94b9..a8aa0bbf0e 100644
--- 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;
 
diff --git a/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs b/tests/Avalonia.Layout.UnitTests/LayoutableTests_EffectiveViewportChanged.cs
index 504e3fa585..f1cec24516 100644
--- 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();
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 0c7b966f29..b03ae00cfe 100644
--- 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)
             {
             }
diff --git a/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs b/tests/Avalonia.Markup.UnitTests/Parsers/ExpressionObserverBuilderTests_Negation.cs
index 0be3bbbb9f..0028502eeb 100644
--- 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;
diff --git a/tests/Avalonia.RenderTests/Media/BitmapTests.cs b/tests/Avalonia.RenderTests/Media/BitmapTests.cs
index d52539c371..b629304b77 100644
--- 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++)
diff --git a/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs b/tests/Avalonia.Styling.UnitTests/ResourceDictionaryTests.cs
index 84b0d09b61..d91d1fab9e 100644
--- 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(
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Child.cs
index 8ae556cc6f..d011c16ebb 100644
--- 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
diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Descendent.cs
index 81485f0345..aacf2ce223 100644
--- 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
diff --git a/tests/Avalonia.Styling.UnitTests/StyleTests.cs b/tests/Avalonia.Styling.UnitTests/StyleTests.cs
index 3e2bd68cf0..df94887340 100644
--- 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);
         }
diff --git a/tests/Avalonia.Styling.UnitTests/StylesTests.cs b/tests/Avalonia.Styling.UnitTests/StylesTests.cs
index 9d3704c91d..88ab124e01 100644
--- 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);
         }
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests.cs
index bfcc341eed..e58eea42d8 100644
--- 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)
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTests.cs b/tests/Avalonia.Visuals.UnitTests/VisualTests.cs
index 97ad608346..447a68aa69 100644
--- 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));

From 5a4a172652444c1e39d3da18ebbd76e8af14528f Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 10:43:04 +0200
Subject: [PATCH 4/7] fix NU5040

---
 azure-pipelines.yml       |   4 ++++
 build/Assets/Icon.png     | Bin 0 -> 14349 bytes
 build/SharedVersion.props |   6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 build/Assets/Icon.png

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 721a0415f4..e67fa14c57 100644
--- 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'
diff --git a/build/Assets/Icon.png b/build/Assets/Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..41a2a618fb02e4cb7f6a15caf572b693bfe1ebb1
GIT binary patch
literal 14349
zcmdtJ^<R|1_cy%D(z$d>EU0vMF0h26NSCC5pomCGr^Esh3km|#NF&{iw9?Wnjl|N@
z`CNWJ_xJlef5G#^&FjT4v*$W9bLKr~&Ybg}2rW%D5<&(-5C}x_NFAXA0)gZH{o~^T
zErD&~zd#^~-;WTAdY)f*(0E^|PA(J<hDDkT?Fmma&|M2q?X5K`(Pg`m_WJ=UFBC-;
zh1$W~+fLbI#SA%a-SKNs4M9bm!)%y%Zo#9SFZL8fG}0bTiyL>dJoCHg9rW(}-q6s{
z#*KHDgh<nsY@LKm#?8>qFB4W6%q0k{gg|^3gd>rC)VTQM<PDu5HW<v1junAeBZPz?
zk)~FGP;wLxF%%FE{l7=J(_8}n>FLhj#M%Yxxfs$Hp@c8So3dxQzuFO6D`+4HKNdX3
zU$5ATBk*Iq3h=^S&l?<abo{6qF2GnlvuY8<Y2AgvMUFWdWaOX5KJE_c>Fl7GP}W<6
z!%2fSTZ=YX;Xa}7q3U>`3qD>$uw??ic;UcQ;9H#~hXP-|5dmoD!@!eAn4`WPE8Fhp
zy2m^eUcq1`spUO?vi%Bn9Z$EuO(AZVukaXyO(D>WJHqBYfuJ(b8>&849Qm+KnMB)`
z7Tegq#og}ib#n=|-&DBx7egWPvHNLcUtf2*)w1R@*xP~qm)tG5^s?F&uss>G895?J
z)+xMi{%i;=thrkw+=bwr#awz1G8)#-%fBfEt2^N|VoCnOw900JZowTqgkDlMYoE1;
zEv{Rqo@$o^(wJYH&%NWxF}z|GBjw)U#@H!2+d=_qPn@{V%UW(TeRfd_$Bk@+G`RR)
zL-J0qFyb-;P0Gizoc!4D3Z~>PwAY=fEO8Kqo2S=yJ>MHGqo(Av-&zO8J$#UH^E)UT
zb&Dm(0x#p0AK5jO0X1_5Km7UQW&hyM$hM<KwgEX}=)e~OKjuXl-ceV+J~)nl=ifNt
z2ZT%d<h%wI{tA~3QEfoy10=-I$Ho0}>96gmRU=i7b#S~P_+Dt;c71rc67ek^I{8e}
z!&O^D5YEY$m!>;AL+4NcN&?wq+!faB^Wllyf_BG|w>-^n!>+@@N?anv!@5_7tS<Kv
zWuSMTrf#$-s4x?qra6C>84ald_T6RH$cUk@E2iz0pV~`iDy(+ATb$#M)FF6Yr7Guh
z=v|hYwbKJ)Gkh~wJKOBC(jZ7jnpp;DF)0ZS?Y}>K5@5o*?Jn}kkB;@zCwlbb=PGkX
zhG0&DP5NcUYQ?PaI*$>B0|qlaT1ZGrH$S)IoHXwg79GwKXt{_Ik)bTaUX7lYaB)8*
zElXwFcjkddrx+h2uG9;zy+hq0*gjKcJx~Jf8wplQq9c>xd#yVG9$sh?ukhy}7aKC(
zL8lu&e#7p2SUZMdh72V_#3=Yx5`NxB`18eKR)Pnumt2}#?PDW7PwSuHv=#b1Et;hc
zWm7t&I-jPfs5|w%BA=^`2Bz}o;PbPlr`ylHztg2*cSPvBt{9Sq;fpOl{kch!V?gTL
zjZx(kIWKznMCuBa^O0Z}`yD?+1c@M`fF9ek5ysSbn`g&AyXh|Q$=tUaZ~C_@O-%&i
zNR?<!Reg{kP-mk}j1Kmx`d;8XTAHFIVeuxt$<wL{q*Fk3Dz&F$trS4f=haje+2k`f
z49%kX2^p#Cj91)XGQJ)?ihX>s8zF@(I}S`XI==cb(a8iJ`ktce<O)cNLYH3s{NkYY
zo%ePgW6tT$TgI6A3mGl_ApN3G%gD1yT(&5wYf*3yFLbrjTh}B&`$p|spzcz>_D^p+
zlg0bW)|hNy>aP#T=s}cG%+flgBeEa`7Y4&jZ)P>vC-O*IJ|n|e@7ou9lSfjmjjmrD
z=L{5Qv~won7k{@r=2s4>Y=2Mwk=s~)$-j(|?d*JDNZaG|_J++sofd4e)~t;ONOV*&
z2qndG@!Xb8MQa_M7Y!+Tq+i$v1Py`94Obc61reN#z65=ra}1B~ssIU>^T;8#1fO3{
zwEY6te1RSA8zP84JgSkVT9w)bn<TS}am>pCuk+VK<aHSrn*?lM?t@|qQxbluwk+>D
zBm&xUs4&V_B9?1a-7MZ{La}I;)j_aF`pL*$m8JOvdO3(g!Da5?R7~TX++u)JvDf~$
ziO9*$eOj-7vQ9XDzxch`m@4I)bg8V1|5Ur#jQo?8q{t%Hh3CD&T$~OzcRHP}@J#3L
zR0RZB7QimQz?-BT(e$uS?6(wL(_))>3Ko~8z(kaNPcBE!tC*!H===!dK42VsS04Zn
zV3#NCFco!CIh-?>P&)J^?y}pHbRF&P*^B~_#>k{By({m$5sD0}D>Lr2hOGs$s9LoM
z*X+l;w!95l5rX@!#bo0-1$MjuIlkTyMsPxBu`YjqYK^@a!>AU}oZUNb-x;d<+iE}e
zni+v7;c!ObVW-VcnPyb!+b$V&U>4qc{(8_wci8y%OSOg`)q6Lu{|F(F<s8+6rsDtE
zevAadtvXfHA@XE<_X-6A!ff3O+di@>g(PJQZlLS4&wa`m3AkGySA9ZT-v&{T%CWaU
z`Ye*WoDm7g)N$zCuEtktw4OGiSXX#NiDp!YVyQoGfS7{ocZHNg`Z{D7gzWxCwkG!)
z+9ehel9gbu1#A!5A)#X1lty{On;Ve|hrp-HJR(uQ!|;lJuy?2?vMH^tWpHoGyu1h`
zYkteY>B+2~Sl@EinULwJ?GcVgk)f7FqR=v3@>kq59e=%6S*7MpPpn4laU&|zGSDVy
zZuslsDDpeDn}w(c`%fsF3oD*#&g4LZg4fEsG8qD_J=%lmdo8rg)S<1|9k(^E3Df8w
zXk&z?JaKsL8Pe|Rt{0=~La)ZkTp9I;nMvP_)G}a-9TI~;er2MM*e0sFl&xu-ie3}O
zMXK#&&s?<|4Hs@&@hudH{FBgSqaJ=Ddxj!4mxwQ>V`VOHl5Gx8IjACJG8B7=!{{D{
zk4n((Y$Cj~q2=QRMr=xT)EJc6(7K4mDJ8kZQm+fs(0%tYxEF!kmZ@&%md(3bT21=&
z`SYQf8lf|Gyf*i}+S+snR)xoNeSz%c*|=2F<-0|c54_Q8-<R<@KD@>Fm6M>B#l~OV
zqkqStq!)WEc@^GmA#hiJOj0J(Pwm@n+gIB1=i0Q(yILxBGvz)pxx`8RW8IwW#J=vF
z#Iw5uU}jjYv%;39`(7=|`Ycm}!{@4LY)X2IG}Plhzm8Vi%_UYme7}85Hgj8C9<@Jz
z3i9!()dm){o4mWn#V8+rechefyw^SK36+c9$qo%2wco5T@@)SJLCcnFQmNsDhj(9B
zxLI<=Lh3*ej_B;X6?0G;#&NqSz!E7r2~iFaRt}VBY$HJLxwH89IQyr}&$<qk>AiDG
zXtJ!A`Psl+FB2uKr1GtP?cz4p3yows{QMbr)%({jcj9f$QKr{wYU4Hw9W3Ug9h&uV
z`c3wqj}-z`Z5!_F{y)r&xZYb2FS<j2UXzbpr+7v0xD}?X?D1}RFYWOTAmx;-93uP{
z#wLL&N)X3U5ov6CfJjSITqIAI1@*<E*j9|lh{+!-=zkq~sdk}Pc6GoQgVEhgG<W@O
zFd;>929?^WeJq;MRP_}T)KtZJ!;2#FjJNuG`1up8?zr`iQ_PbnuJ+wLzX*a3wg#~X
zRUSiGASPtzLqB6poi#PVNgji%(JiUpIu_#dJnRnHTj$eM(&r>7#E7T{Jm?17L63su
z>elXX+qr67O=w`U<qPU^fb&DIJscl47oNxPUk7r{DXn_X2c$%Pr%|t89@|Fq&Zl*w
zjn^b(x|Q<dH*l|iU{ossZ1Y)WXr(wIXhHZgZK>;fB@Zyp97;2VBXqpgj;V8fst5hA
zf+9&5=egS-iH&dJlkW|^&SeHXnLL)8<IPdTlqXtEe03WAtwL^ppDwr+%vyFUykQ2L
zPn)oj+Z)Q>shUBog;dzyDEw_iz3C!H5{bY0IkqVaXAHrUq*zuDap`BK5I^%qBWhm+
z)|VGw-A;jAOeRhzygnpsLkrWoq0S|EVff#|;X@fNrz=6`XQ*gN^JimETlN-cA6%1x
zd?tPs&yKHN>$!L&{`3ayG_&4@<0TVI-}+|cWf^1t1EwGjjne+WJ!%P_5A4A3SJXpf
zo#9@&mS3ly+Ay|uKkl4<d-lGLx7qZndBR8HCrW+$KPJeT*TLleH*AcyA&P;g^oKb{
zgf70G|MP93X@)o!K{21qjtYBPR}LJOdR&Xh<P~?ynGo>UlP2#SSNcFr``5}{Xyd}N
zUTD^ib4NAcrl&CvDsg)M3<_q?eKf!^xb*>%z8c!Q|IWj}d)uo{#z7>|o>#4iS?n~*
zfetPc-udZjVTNX=DZ%Xh%Px#+^PhJ&4~oiIKPfOV5RvJ%J^SpfAob+c8<CtC#=7aI
znJ_jT_qn1gv9F6pEh%R`V+TWGvD+hRY5XfRGHCV=y*!M53~_FUX4eBuw}jalGda!z
z?dBq)BwBS)m1r_w8_@>WYpdioabjrN4(7A(T4R1zQ#HFY+lweKL+;>J#6U-XWJxl$
zAA(}Aps#m?`aCq>+*@!H3%qK6+vUI%Bx<EMy5rZmPR$Z&IedPfDdPMc#}PAcb9P*k
zvg#By&CcQ8f$d$>&t*+6k(}qRiX&?$2@<m@vE?#1!ApH^leteu0>W#zQ0#`Z`v;Ab
z0?ycDA@95{_yTvfUfO`jRAK2Ki7P!gj_!BKLX3VsX*jta6rc_WB`#iQZ#KShdi!SK
zQ}!5yV|bfLMFBnpcFTBjrowk0FGbviFEH8MW95DfoI&XOoFASF#}Qj#XW~cVxMft|
zUZG_SLY~$rs(UF`Ci3>M(Q&RP%X6~aaqjia7=aujm#!TI!t+E^ip?dJ*WOtkyMCwx
zd<}4~jIOV^a@yCiPZLNye1^n+<1wiTX4dU)K4NLP)2R(tg?)o)C};RHO6z7SQ`JM^
zLBKs>m8$;LuSjr0^WG00;yCQLdt!eBvPTbk^>bny>0p{QvPEYo?!5|_k=yvsB!A4o
zQma^&#a8Pw;YBF?JLKILAY4;gq*~jRg%u=8E(^tB!ybs@j&$lV=YSN_J{NhHMQ$In
zpA80NdpbK;cTgrn-kKYDHNQ+TJMJv0^-9Gp8sLP>_@HUU%BQ|Z8nA<|djMRulOsQj
z<}dmLuBj+sjWBFUt9GD}sorIUMypQ7Ui~`Zczs^FSNvN<n+Q<87n*3|{$gzmg6y7w
zLGuJgQ#hI(iboL>Q$j$NYh?rSm*$!A-e>5Ju1h5GZtO^)W(8t9i>#52{4>8DSZG)9
znthp1Hr;MHA5$Y%yPUa4{41uQ-y(UvYwt%4?yyH%Z-rwJDUE6aYOuwk6$x!7UxDGv
zXo;r3JI#DPyEnzte<8mW)FNaL`fK|Z)bJeT)@#bQg=V)2|9KP&bF#uq1`QIL!XM8_
zb!Xq1H*UZ3)y`LQY$ghidLo9I)#;y#;`_qVFCcj|S^0C1a5kz^>btS)Q<eTBut!H_
zj6ol}`I)k0w)?^q5ECNuoUwJnN#<rJOMhH}{J$Lj6&E%ez8IPjq`1Hy$*N1dc@e5i
z`Ki6SisnpLV{i3gt?Wt9CN*T}pfTdf3Vv=(DO%bTN<?PkX|tr#g6(nY#sO=;8GSFK
zY2(RJX0zUI`%-P;QMPA0#vE(sn9Gmm?C9TzipSE}blM)$33!bnW&%G+O9E`UzBjIy
zeSlnS73meW9;{O9Udh)I$6bMUm)xHz>b8)0^<(6PLz~KrKD#BmR~i{vh^-&)eY4yh
zGO;~^b)Oy;-|lK5O;g@a#{c-;Ns%rS?@Z3_6&`KougE%Sx7S%@wY)t`;N&4-+noM4
zZM;oJ!!~B7Zo-&2_BW65%-wi!vw_@e{v~yKO46)rm$KA8su*}tn;<tf#uaq0^0iG|
z6U$*~;7Zcn*~<Fgd(5A7-n?Gy{SFa~TGWWAC-iM@*^p7YI7xZazl5KA1dkIFq+#x>
zMJc}Z@ABYbr4^JF25zh1HtMDMZ6||VQOYGeM|1ft-m<GcY+Us>;}5*u#ozuGF?$9K
z45N@edvkYt8D&dKhIpk{`J%n*Me?*N-|Aun#S`zEse3j`OCDCyThf0e+0UQve%+aC
z`LyNzYBufU*=Ku}rZ;`zF>TnkUDfj6dW-v9;H1ZmNlb?3C_B>ct(-512(R(GKuJBr
z{jDg)Jj^$Lk3?TOLKPno*=EBd-^0b<AwH1v-xzZjQ-A-i#xBf*F}?$E_DIHsRZjYr
zHy1G~K=F9zxdG`iE|11XW3N%Q*Ghh%_58&#b$$Oo?qpjun;@<&>0+Wlb{+{|`RM|?
zMsq@?wWzpnc5}9dZ`|H|k)<Re*HE_OJ|-&j={K8oUwM`;37qC*TqEFYL4{(O_3&u#
zJWLHMqO~g9Amh13{kB}MYQJkvdfT}l9VVbyo?h)0YnHlA;MCJxT}wz;*u5)s)GBaQ
zU`Sj11trf^;w5f&oLJwN7FRd6{xxvx6fruD2{e?|gebn<?;(5>=)33`YYrlPT_3_W
zwt1Z=fTX*!LYlq5FM!;nyw8KjuWMO9<+oNap7-^ni>&1>%nXZ>^~JH$Ml>%S?CGEr
z2ZBl%?SELL5<{Xr$x!v8-4B|)>(0`k-bLkuR&K-=hwH7Ga?JMyvyJuny0^N%xg~mW
z^Y=loDkp|I<T)C&BnGUx*o$SQG9UFMc)Ge|(Ok8){`$WAhE&E!!<H_*hj+G(=06fh
zPF#5?q$d2=lPsjg;jMxV_Wd0ObPiy2FR(bs!afnawUtMqK}<n(MjI0uy(o2;lkMFh
z;Y8}jugl8;);});9`q1v*27SY2L26SSKTSMpnV{6YyWN047PaFmK3yc_Dfu{l#Q79
z&yXZVn;2lu6zm2Hz^KC8ar&a=9=_L7JX;g5v_x{GlzDEX*2*|J^QyMilnMrLfXuxg
zs9>L0IL=AcwG1{`6mT^S{7}&f!T29n%ZI5~Vd!g)Q+yIh7T1lCzCX>q7v58ggfvy^
zsGPkzSvds!t4a|LKb+M-d;L!A_B!+uFzgiNrrD|m(`BSJ_^3tbXVhI0_w_;|RYi%`
z&~6W*d0;!$?k$RKEZ#fA(MjL4com{MgrwPH`mqmvM7_J}j#o%i0HS~26Vd|yN>`_7
zi>xoQ!<NwWd3zw<i}&rT^LU29jR7`rs;R|DuI~8<Z~^X1k5Df#<i4rim5d0&bc(WB
z`nJ26#obqMKq|ae!Zpii-<?G&GxNn%?U1<y>TwVuv|U;;$bMH;x$CLisQsgzwiq&m
zR6cMD>G9oL1rX3~H1-3-tiz=RcA0XxU#E7)Z4cpb6Rti=#os8}R%>!<hrX&z$4^8b
zjtLk_$%EEQgnr`5<1O6>00EYwX0<9~?5p06{n~1FQ|2P^YjaQ6--w*V3^t;XC8_%D
zh*C8s38%2xG;`Hf@dcaCUFE}?Sn@mjlRVK{E6qIf3CH5Sq*3o8)dmIGOub*F*#^l|
ze&?nhp^<BS`0{a6ov(kDHEC{vYkH7N%>zu2wr6$v4jt^4w+;m?=9Yv7sh9wVdx{kZ
z10sD9O0nJ;zbwgzt@eCcP30-plf~8sgWjcUSQ^gRSh21i27K(3qP>i|mIanYQ*!5K
zeU**gXyqb7IK`J+lm5k*ttMlObi0tvIn6o(BV@DG;kT>+_hvSnp3U`}q=>*p(HSgU
z@AxUXTtY}LL6td6i;IIw(-2`=VEwaq`UH=WoHlu@B%E5<*{|#QtC67zEpOTM=~xE^
z?FPlDMJ)K}9~P;AZuJAaKuT*EzTNkH&Zg=el(VOJpwyPPKk7b#Db&X;c)VuxjLbmI
z+5yJ=;YcOg!{7)#>wlq*;@X+{*|H(lOu)8O?EZ#3OCfOC7%LHDzpbiyp+QddY|<jJ
zn2n;+E!`SIWrS<`(4@;=^P>_SEB`NJYp1)ZtZ-uJCd;<K&km>;W{5WY23;YEGdaBu
zS-@^T>Ac^Mf@~2(lV}9^V`}FrPiV2sOahGGh9VQCY3@^a{ld`r?jXt-)p2muiKh2w
z*Hue0){lh9e}>efSk+(yM6Vlj<AA)5GWS|n^5zFkX4j8Kc@latlzpSPv*rjwD{hIj
z#fZ%|ke7wN#p29^M(@MzWEmaffG4s2c&gdUQ(z{&faKv}BMSxRi84)RUWA_e%S${^
z%yA<b%cUD|28H{e5gHfbaBgMgV;4^TprsLxy++D*5iGOgVN%DW#LqJ*y<?Hexnp@P
zUJq~08wObR7un^{7U(aTUa%*art`O<roh&ar$VpJJuUqgS%gkSSBLDsw<6gVtzFHG
z$zh=#Z3EW}^&cR)u-|1VF)OUiIqsXif80L-!6PNEsV<{0R+B5s_K@NGi`nBPu`&+s
ziQuM3*){KV<SWg|?6@MQo>qTy!m?Q+ct6*X|1tf3Pcv7$3fJ}xo>sE%`7ODVsrNv^
z`19L$lTQQvH><nC*(x2!PoZu5Um0pz$}@@K4FL2}<gOu8a@C&%u-3*BdeZgi7EZ&s
z->MJa->gaaHd*vjI);8C9_=k+7&~u;os%$Ez%HYVINWB+AS>g#+4;8Nh-VZ1PYo7v
zoEzi3^RMJYTXWoZZ&EbY!P1Uey`xcK@0n9JP8DC4@_Xq7QTvmTBabw43X<!;*Jp9J
zDj?G*z{2&bn;G24^dKLbqCC)tTD8+_YmJyF&W~m-5t`+)SIS*<>w7$}X|x65rclT8
z!l!Nhv!IJ^t{fjuEkag>@fw`^f(g9v#r@OUD)W0)gpm{eq~ts$PWSEOI5iQ(Q`EFn
z({mVR6K)>JT4jR9sctE8tbzGSW+YpZJCkcE<_aRRG`DXwb@#;g)wv--3VWo;`|kDt
z@c9r%-naKfU~Z_%B!rM@)14)7sJVK)U==-I<yTz#OzDItAPiZ<uc(V4(F<s+TTS||
z%}#aYiB{6EH47x(HqzlOx@q3aG0CzmxkCF2|KzV?hk9kZblS0HXE&=e-&g5y;&KaO
zkJDqA^|DWg=K(ipxfa|E9hcTrnMl+u5&0!IVl4rC5Gu7Qy{Z~M7W9ozK4M10n3`24
z+sB-6NwDmy;F<ngR}sP)>#M{h5Ze3-ev41O+!Gkjk<Hk$*AZS4;7`4^<W9+l(g$OG
zurjZUYcKpD6Z7cuiTjmV6I0yOiujT|J_^b$|8xW!#ooI0PE9G)#|y2jVe>T5^!@gi
zRaVJCj68+*rlrT3sKA7*QX1aRZRn`_rUC&2s|!_hFy<o>Zr%uBU6=zFw(9WT#!yu*
z(-S+Y{oj6ZjS4ScArVC8cb9Y6-4RT??SIOELB(S0EV+~Mq2$2XlH(W}hWnDov=3u6
zFEuO?hl-ui-tWWuB*fn&WD26#n|318K($`z@I^YFzYibh>zrcazbl#|5mn*a`n2OW
zFjrmJEL|3>6p};cf?+IUJV=FlSk=t0=U+F<1^zQV*Xv~K_?F@QfiOoLt&2yz79mJI
z|798!V^j0nb|=vRa`h;EbxxuoX{Qv1I=fy>B3hw)IQB}2M+tF(CS6O}A1)aZWgnaP
zH$NUM4jU!Mmc1+~#K_RZJ?iJFHQK{5P^-W=9@x7ZF?>bah$GoJnyQZiLp@aF9u_a}
z7u+tmvxFcyc;UYb!Z0jikE(1KcXSLyS)xN~0pI0H*Znfdqg14G;0UVS8pV->Fbznx
z(<*GATD(lA2E#6zd=Keew4EpNvv0qbm5`EK1n{TH=B7~3QD#JVqTw1g-7MG3VpX@0
zdVh}$AwoZenJeO5SsAh-M~1h1RpJOb*0soY*zux4f^Z!rKWC{;kN6hlxsg0}ZiT&4
z&D5(MB69HQlY>A+w643yN5OWz&rRhzonyjf&+R)snqp?^<!5B*jnsD24-}F1>uN%u
z_c^$@s$_<T#-|zYKaPY;VLig(DH`@fD_dh9&98Jv<?!z@1RPnNhN~}}nC&^AIolGJ
zl+D%sJ<+#q`Il)sT$&rVz>2F$3Na8PYii6;Cky`vC$5majHMtX(>i+w04MHFKr$Q4
zY}1{Rz;}|{sVa(GXUA|XeJH9@0@2l(MZg@=hZ6epuFU6vUHjw&hqH<cUe3<c_&jjG
zWiLk_ocGIE<l&YF;gox-Z#LG|{rLjBSIB}Cb_!V#N<@R6^*cU<L!YKB`MM=i^Q19W
zGB~zmf9{vNt07O(jf4NGE)r?$Yz^-xKX@9>Ba2Me*{$14!CjIA_L}uMgwZj{u;6o$
zd;T>AtY@==U{8JRiSySfKCM5%mY@H-EZ4+q%|95Xp&Yf;8b0~-CMxynwh?o#3zloW
z^##zkw1({gbIEOwFh7GQC%J=zi=Nq(l5dhQ*Bv&Vn5ClL?!WoXpnZ~{%WLC@ygo2g
zIlEjT>|bm7S14p`S2RCUOiua?rl_*Nsh%Nh_>sDO<UdV#_j~tyF*$lqR-Gi0((w{?
z!}g+vUqFGY;~sJaxwo_FPPP_ZLK62SeCk=lQ#Og0^*c?fqjt-)5f%-8fsup`Z`RdT
z#SZgWjG1BC_MW$dC`j><X+8o&vtC(33e^kkvmtM2{^MXZ{s=o@mcG_ow$f_A?k$V;
zG(BYuO-D_W-MJ`&YD}(!Bx0o?@^6FYr@xi*@E0_tsYjVO7-D3}qh~m1!U;y8!Fzc{
zEaABub0kh07VEHA4k=40@^ne8qJZmPiUic?0-|`*iXZm{Z|a%9$A)%>8+a`V>sm&I
zj1lLUP4Rd-T>MFs%rZ?~a#)(sAxyua-I;Q~4Lak5s7t=KArae7DEqYqIz4D4I|?h~
zZ!`51`f*jJaC8~ESi?t0%x(xD8SGZ}Bj{rhwL$+qc%C5tM8#?9ecf3CVN2Uflj0%E
z*sDU99DdTj9*b&h?>xs@h{y}ux+;`{y-6IzOv;22*jDNaAg70iqFU{U?qf=$7zgro
zc?%r%Xdn4zJKDg8ih!iAZmVQUY~!@50obTjkQ^=?BP}5Tx+U23A;h>NjW3L^Y6X%$
z&v3~=+?LwMv^-bw$RLdwfAi)u*j^N2**yN6K|sia%J^NPLM1D8VaNg;4GWV;Ewct+
zIwQOHXJ6g5o?wRP6d;l0HLfce2F@u01b_C^6PBKhvmz)A)U}2$oGE`73kE}8erLXj
zb`_zrS@n@SRxmI>uSzjnwu-XI&*0U*r+0MSt_I|u_$+{YrjFn84<`|A2cwNc<!WhJ
zCN<D4bHrL`U=-+=(?XS^BE<j^$w>Wb!4QB5{zWFlu<8#@77OChtJg8o4`nmcHp}bC
zNJ|(qryB?erE&cC0KD<xA~mMc<o%&~ENHpNpQBLnZsYst{Jo8NY@CVQ)^Fk5Bhe3`
zxQvjlP>VGGUJ}(4#ou?NoAbn|@`x}z840)|wHURbK}#E4L*YhKJ~5#eK4xog*W|9Q
zbf)ZV+?j)00YzP^F<kpSK_JR--7fcbad1rj)px^FxxW`Ae>eG1{~DWIjdjosP4AIT
zlQ{A`*vRv@x}bPp3#xDQzM0)kUxOshAYSUgaM0uVDP|G*;0X4(2VJW7tTf(!WN^*V
zGtbVwZ91|1h|n7(0Sz#C6>+j6*2BDcUf=h}<?)ondZfNSJO1|03x85UZ`}ao6|q=~
zXUPF`x$P6lW7#$R68yq9L+zQt($^xc^%3?ZNvuLUAX2+sz?r-ct4o4AE3Nw!olEQx
zER=3st9MaosDjRIvo~T~G8p(!+aIi&rV6~-$q7ksXNt|nw@zacZE?BQC_s3fTi1K%
zlueYfegs2XH2FT~dmm5ItOjLX4><fVv)D_&c6c$Wtj17rYkn4OhZf^z8qjE#k7rMh
z*wZz1Ykaln%e9H4hyvL`{!Cxy9OCZJNl|cpe0(7pqZG`=?UD-r5iw;<m;!GxtItc2
zqZ{F2m1J)B*KccyLMfK3!PXOndNqCgjvo%;aM7YieMX%P`n;P?=kvoHG$lU`ldH#H
z%VQBtE4ooKTGQ%>;k{lEZIB!(JxRjZZuf2_cW8DM8qj~yZxb!!Tw5XbB^ag!&Q9cV
zD9;u_#FLSC46A(=%1Hub#8!uW>&dV;f+`eGu({!XN*eyM!xe0iq9$2VY_Jzwyo~QN
zCo@<pqs;Mn+zcl4#xcA&8cX6J?jytAL0)B!8K{)I>(u)xN!n~vRDMQuVD^w9qX?qF
zU<s>Br&K;Qg>4KG`X{6>SIF!E%Z@4XdWhe|v!49gVjVG`0o1niv1nPzqraD=y+Dd;
zXB9$c*kQ{)X;E<*TzZ}5f55Y<4t720><(VSuRt2$x@J`Y=Rk9pDNLP`I)xDRSM7b8
ze}gOeQL#)UGjm>?yuPmcBy|}61bIEEF!#u<g`ODI!y`%!Yg>1(bm;}EtSkZ}T!*go
zu-{s&kS@aHe8wSQs@ho<&{sK$yg+pLJ{`~&^&dt>_8+pq+Sm2fhtRAg0-HdlgO~PV
znHJ)vozPd=N}W)0`=na0=lL?UtZmaNZL4*G>Ay?d6WJ&{gNUJwwb~sbga4|MDKZod
z{x(TlAHEW4)i&j9b~v!sSH6_KfM#U^I=c!+zddsNO%EF+BJbGIHp_E=&kvv3J{4iv
z%qsGj$N&fjJwOHr<`b5ITb|4|R&GwDoLgg3>85w~DqM;-^NsbH=>bH{lL@XkcxgbZ
z96~|xCQw%E<vz9>S3LS(_oU<#ciNv7Vs~X<J=?(g#J7{Jc7}>O;SIcb{iEF$skH>C
zf6-;sR(A1!)USo8OE&KS$6>8IKis_PUj=pZdmBiy@+Gr!NIdx_NO7}mxbTJUAcu0U
zRZC(BlCZI6wqcc^sgK_c_#k<-wE8oZ-Zeq{7QtQoqcD7&XPFS2p%f`<*kwH?T3R`G
z3ktq`J2O*zeCh8&D@mLA1c-CqwnzocC2*f>@0y0;-xnAG>pc3lJ=abL+agB&J!&mJ
zA0HX2dM*P9C(m2^%T)JY5oK;<Hej@L*pw70&Oymdr!lnPn@pErw)i1y*hcl>;w3Rz
ziBIpIxKr6ZHV2&dv9j?-;Xvh&^#H7ML-=KJ<=;@G*v5)s3QiLwa{JQ18$jQF^0jO*
zXL(I>!-tV~%0h@fIUpB$QYJ_SDzHR~8uQ)H7$Q_*FFUgN@vFjTP==k@K`gU(GE5Qu
zToBQB4;MesYyZi4C;V1VtQ)|H$?G9XaxTUh_sd~m@r$Ng{#cNrgmF&G0P=*sdjbhL
zVM_TFi4Do9SJ9@xXUdAC4?DLOyI-Y6-j5Gx5InvvnO>EeXCKug!em{l@I9I=zSZuw
z@?V`OQbKGCIG4m_rq|-Ek+C-pN;*9EO2q&>H!s_Y+y(Q`t~)iQgH)lUPHy)iuaxgs
z3>lO;QN3Xb(vw*$J#YodKb`>!*r+@;SjFI%?GXURhDT!$3tct#L)F};C;xmi@)UKr
z_ZTP@28V)m2E!adEsTZp|KLOo19=yrNOBsVH2rG87n>@T+aRrl`VozcI{?H6PBS`I
z_b<EDL||XMFeEKoWq2en!-V@Ri_@mCL%@d8r@s2PXZPG3${L<UE-4m>*ZUGHhl~Y*
zb$Wx(^4^e-dWnq_qdtb?Q|T}%9kT$PFq*hmhcM*pNNwYXOMvP#D}YrC(TN7@#Ht?c
zVY!`w&BE0GC}Rhoatr$)rjm=*-X||iG|)w3obO)Moupg|BUrHA%2F;CLe(qVz!&!x
zm!;^&Ud^+Bu1ogD$CvV@hrj;L(6)Q@p&@>gIU>)*sLZ7{%6mdVddR8S#8xi<xrBa0
zt@%9PlQ-|^B2}HzE_=S*Nz)S3G}-TUpb9iWg7_rzMC%8#GQK87#+W!!_t^77gXKx+
zvd@?eayv7A15bX%o#pLe*)Ck~;eCIWA(T4hgpLG7A;ojGaD;MJG_ZPK<Svi7@FZym
z{UlCI%J%^XK8ZvOUIm)hUQyOK*SUD6i^x%AwJ+gw1hJ*{$Pp|B7jeZPDlIv5tcwfg
z?Re+KTu=Ij(}*?_ozVe4Urd(Cu^LRUPx#emj{hbXqSUSG#du@j@hfNK_|G_=AWCF1
z|6E_%or|46@~X6AcqZ;PTVJC;I+{2Dtm@Eti*0{NVcAEcsq*@}|CkXbt;E)?b7SJ@
zd22pCY&X~kXVScNn3T@#PkW=@(b4A39`;rEEf=;zY1$8zI!!cU`*(tvmLI2p(^U2&
zfyLueSIS#Uj|QLE$mWA#YL{rZrlV)nwq2K(O3|5aaG_{4g7AkUaK=-pu{Qjwd{ZD*
zckAQdn;}Wjf2^LXDYr|kxDlz|k*jTHSE4oAJt<ygGaEKK#~_~I_mAH|jWV-?NS8Bt
z3$Z%J9bA;$IyBKm{2qEd1wc0};Oc>?*FgO@gLzJDrU;u|b&eq#aJp`vh^m`$?L7hd
zshhfRdV(87pg-X*Pq29ZjsKn+tcE@EcMJj;5VIPql;+2UT(+%;@PhaJYOon8iimN|
zpj*&oI4kFt_^Oju2}Ol@OnbAi>j^TpDC2-wi++5yHAgvek8qbjkqpA5dq(+8KOoY^
zU*U`$g;x0H$)VKogIrz2bmG<g^|WQK*M7Pb1>h)vji|4|AU~Q4ZiXy523?zpT{^3m
zSLiEtJbXV>UP{1Rpl$8_<gFcSHwHiS7kT0mKD&2w!B^rXZ1}AB#ntYu?zt<+SR{K~
zt}`|Th#I$U-T1r#t2EXB?AJfQ3CmFwnq;3SBhEm%GFnpH1+w5F&~$AvR!$ST<{m5+
zapHg@Zj1#%?XL#lIFcdn$F)#TKM(ZFw5KLi;qehM3HY$sY)u7(s#+t0@D!`j%fk!{
z_klqXHsPUHBK^=qM<hql6hq`BArnPv5#fi+lU$THpUlW0l&x*avnu&L&Dt~YF^^>H
z6VbzGCU*v!0>bGP3y4tcldmiiRxJZiXKkl5-GnD{rLJu|-}4Vu(wJ)w`M)p*b%S2z
zshL+vC_B5ZBvC1cu&rFz`xo>=*(B&#A4%Gn-C}VX{Nr;BmTi<lwKrrQwvlSH3c}+p
ze~9-iNpofslZUDQ#aui@0BjTvpuPItkB~a5dWA#Pd%#b~Rns+3q}BnD?3&h(3lIss
z6GTw_hA4B;DsgnAG5V!*838#~J!UPu$J`I;U_$_><<JLd|F5{|zVjjY19)ZZ+MSX)
zbm?$_APngWut5Nh#!os{J}8MHG34OsI<|6G1HjuLCLhozj-&BhiY~m<??9qO{;SIh
zsm1>yuzDo8hLQ&C`TC6bzdBqL5S;dOtXx`I!o=-)|0CSL4g?`qfw}G3C#wp0ZtC+-
z{<lXSKv*~c-Ssfq^8Np(nFwgk_4#vW5=3$+(gC$Xasb2%w(KE~yg<vq+!2WFspij4
z+oEaux<IxSQ-E627LHE`3+e$qs_=4pI-Qvq^XB${%yiC&;Cx5N`l|fhZr7FGFRU<i
z5lj$UCzMSA$k|2g8A}q6NB}Vmz#38K55dPFf^a-#=B)AvQ_fQeEc@>d_{t&IA>epb
z*U2Zh`S|{%_Mh0setBCWfrC>3&@3LX8?uo_moWc7UD~)K|A9@|vg0yB1axsvnIqyq
z(wuWbaABLD+APF)2crMmnEJ2raHU&&2WcKWATj~;`5iccER;fm!@=>2L<^~vDqYen
zk$1v~_yU020<a{>Asj#cl-;}I;{8hrS`_-<b`nSzglJOJ+{xHL0W?PkdjudNgiQ%x
znXI6^oT3A$vuUxWyP=P=ft8)P2czO3hLZ6a$-D~vR*wz;#1@bEFAhim`dMn7|H>-J
zpP*gvf3!FEfcmkBCZB%g;WqpS+!$SX0&+rTT=m2+ZT_8D`ova%L74IZ9EH-c8rv*i
zMiA+{L1QESHCD?12N=dLmuDZf(RNUSV8ken?SIRV^~5^RChNlCp*%-VBV9Xbm^uZ3
zRRCWPgy5CGuSr&u7(TH4{pb!L9@s>c0P!nIuH0%xgH22h?A!C-sQ@4a3crb|P5wts
zi3BIO2lD?lu8lN;)02)>UeM`BT86rcq6EId|JraY0=z=`cd@2T%56B91yY~%zq98j
zhO$)r-02H;r!4#Mf+|z{e-M-9W*K-s5`02wSFoZ4mjEIPV*q*p*@ywsl~40M<GfmN
zQxq;C_`mHGkgi^4BaaQdJU>O+0)V?HS_K$>i-??%0T($e2ZXw&<^C&B>YL97{!;qD
zw%!0>lFN>e#3umE8e>%de#H+rk2WxNg+>qoP{Y{b6QNmftH8B5yve8D>{J5^#`^m)
z&)cES0AK)Im;{64t^br%)Cm|V9O7#4l39-L;rv%C098IfWy-%*eF4ia*c?EM(ErCR
zJbL;cu)0h)ljzFJxH)#rV431sYOMdio0J#$u*xdc3-e&Um_mxCJ>m2J`4m_sVLDcD
zh2`$2fME-XWf(jX>^lg3r1c-Oh|xkgEdP`-wi&@BwF6c3pA!OO%xyRU!g_!!uMQgY
zvFoJ$JNfiHH1aFB+u^_dP6$yz1L0_=DY<v|hYfSo#B)FdZ^Kf~UH1Lw@&pk`u#)(j
zD$Csv70zJ=gUmA!Cty|HE~vBreB%j%BPCO4K${p^Bzk9dmFng2ka+6du_T;XzrAZQ
z7yz5Izo|X~^o!_`r*d!}ry9WR9}1Ru;3pffo0eqKBW;WmwVEUhK--xZLHnFW^Go%1
zW3fsuOi}q$&cA09Gq3h8WfpL>d~JJEhpTxpcc2^XiTG(%#MgkLH0>MfH2S7)ab*gH
zx}%qxXX>I8o!$itI*;Q|iURbUzbtyz6amQy4JICrf{o)QF&!XL#Bs{=zz{e-#_i=G
z6TN!Mr=JXg3RspT4mKo&p~mtigcj5+SpBy?y=RFAr0^1nEsl6mb!U@3I+xdS>ah16
zhKnyY{8en#0{0++M+QABge~$oD+x=dfe6^lf7x_MmttX)Yh1<OeWtSTai}06@s*al
z_b_1M*6i`837v7vgcxB^DLqVz9=6E6Ca)K=mwee%ekUy}h{FU4F*ODNxCk=!nIJeF
z<Sd|rasQx_1Qb)U9aTiS8_r#iU^Ts&HVDUKFX{qi(Inq}zaa_adXJJ@t=ea&<vunE
z`btm$TqdebYD3i<lrpM6{&KjP^%$NjkNyFHc3TB%J)X9GkKJxv5umJDOO~j$rUNen
zui=NO(}W|J{6Iv3k)h+}^f%vr+(S~l2-F%FoU;tTwX7uZ+1|)csZtrFE^?8_E(I#V
z=OMQ8h*qJ<he~X+lI|0INlb6yzj=Wt5vc=cR;OiS&~VJAc=p5}v)xM*K?u0PC`g<b
zb?&`IOpa6gJWc^}sWr!!no+Y@^OI3r@e>m+zHQg92@wyF5yO>-ZLH7_B^knD!_lB@
zZ*kVrRi{Cy;wp6tBWzLmkQQ<+RB3pg{I5PgQO=3-0iJ8r;}qw;0UxOEEUv4(w^}$u
zrI(kqW=oQ_AL`e=KxQ5i4xJzr!Uo0(9k$Y+w+5itNgh80o{nq>3Hv+@q@K8Y+uWGr
zR~?dlN3`^W)4Qn8oEQ~C{X#bt<OMDoUJD(p<SOpDZCZv<e8Yo;R1VCaoL<4#AAWe*
zofqKMcmttSvB2>r)WY6m1CycdkbOV3N-6`B=2~jq`4n6<%mJ$#H0_gIS%X}Q?yUOy
z>zK$%jq{64(yU(D!KHc1Jz~Q8?6^JWbR0gI`~gf^)MU<hrXoDdqAe{1?=$@4SPvXI
z6#*Kr|BztZHmn{{ZQ--`!jI|TvD$qVpwl1)r8Odm?;C;z?ay_5JeRfV9bv%L#y=rA
z|0Aa(P-^fw``)sy3(A<x2+)`CDZ4h4WPpXk*I7fEUq?u(TiwI%W`ph!W$Jq?clnYS
zrGnlB4+Kn%J>%_Gr6f`m$_Od#d<LW}8`!&_MLhhtO^H=<)<~uhQ3O2sA>&(iOC;B}
zG&Q%Otz8H^MTSYUa@<4Iv}nI#Ppq995Q4D2uAz-?10juGKD5+-drp0>iJ<P8)u*PK
z=D<xoHGke3(fbey{B18A&Qkne`1I@lm$z*fcVH0c?k-uUNN?Df#0z-l2YRHUiTJK$
H8T|hMTHCz{

literal 0
HcmV?d00001

diff --git a/build/SharedVersion.props b/build/SharedVersion.props
index d3cebef418..bc76058f41 100644
--- 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>

From c364ca6f9bc268a4dfc336a8e39f6d826df6721e Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 10:44:27 +0200
Subject: [PATCH 5/7] fix NU5128

---
 build/SourceLink.props | 4 ++--
 dirs.proj              | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/SourceLink.props b/build/SourceLink.props
index 0c9b6a34f8..e27727c9e8 100644
--- 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>
\ No newline at end of file
+</Project>
diff --git a/dirs.proj b/dirs.proj
index bf32abef72..594f2c22d3 100644
--- 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>

From a2296478ffc11106d635370d8e9761e84abc2dbc Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 11:46:59 +0200
Subject: [PATCH 6/7] Supress warning MSBXXXX

---
 .../Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
index 0d0dd98a77..0e11ee3b92 100644
--- 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>

From 4403d94c5c26d50c7910dc580cdd7b313a85e1d1 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Sat, 17 Oct 2020 11:51:05 +0200
Subject: [PATCH 7/7] Change boxShadow to boxShadows

---
 src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
index 9cf4e62030..d6e88a7507 100644
--- a/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
+++ b/src/Avalonia.Visuals/Platform/IDrawingContextImpl.cs
@@ -63,13 +63,13 @@ namespace Avalonia.Platform
         /// <param name="brush">The brush used to fill the rectangle, or <c>null</c> for no fill.</param>
         /// <param name="pen">The pen used to stroke the rectangle, or <c>null</c> for no stroke.</param>
         /// <param name="rect">The rectangle bounds.</param>
-        /// <param name="boxShadow">Box shadow effect parameters</param>
+        /// <param name="boxShadows">Box shadow effect parameters</param>
         /// <remarks>
         /// The brush and the pen can both be null. If the brush is null, then no fill is performed.
         /// 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.