Merge branch 'master' into issues/4866

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'

build/SharedVersion.props

@@ -10,10 +10,16 @@
     <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>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>True</SignAssembly>
   </PropertyGroup>
+
+  <ItemGroup Label="PackageIcon">
+    <None Include="$(MSBuildThisFileDirectory)/Assets/Icon.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
 </Project>

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>

build/XUnit.props

@@ -11,4 +11,8 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
   </ItemGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\avalonia.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>True</SignAssembly>
+  </PropertyGroup>
 </Project>

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>

native/Avalonia.Native/src/OSX/window.mm

@@ -1338,6 +1338,12 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     }
     
     _parent->BaseEvents->RunRenderPriorityJobs();
+    
+    if (_parent == nullptr)
+    {
+        return;
+    }
+        
     _parent->BaseEvents->Paint();
 }
 

nukebuild/BuildTasksPatcher.cs

@@ -29,7 +29,8 @@ public class BuildTasksPatcher
                             InputAssemblies = new[]
                             {
                                 temp, typeof(Mono.Cecil.AssemblyDefinition).Assembly.GetModules()[0]
-                                    .FullyQualifiedName
+                                    .FullyQualifiedName,
+                                typeof(Mono.Cecil.Rocks.MethodBodyRocks).Assembly.GetModules()[0].FullyQualifiedName
                             },
                             SearchDirectories = new string[0],
                             OutputFile = output

nukebuild/_build.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " />
     <PackageReference Include="ILRepack.NETStandard" Version="2.0.4" />
     <!-- Keep in sync with Avalonia.Build.Tasks -->
-    <PackageReference Include="Avalonia.Unofficial.Cecil" Version="20190417.2.0" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.2" />
     <PackageReference Include="Pharmacist.Core" Version="1.8.1" />
   </ItemGroup>
 

packages/Avalonia/AvaloniaBuildTasks.targets

@@ -87,6 +87,9 @@
       ProjectDirectory="$(MSBuildProjectDirectory)"
       VerifyIl="$(AvaloniaXamlIlVerifyIl)"
       ReportImportance="$(AvaloniaXamlReportImportance)"
+      AssemblyOriginatorKeyFile="$(AssemblyOriginatorKeyFile)"
+      SignAssembly="$(SignAssembly)"
+      DelaySign="$(DelaySign)"
     />
     <Exec
       Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"

readme.md

@@ -39,7 +39,7 @@ Examples of UIs built with Avalonia
 
 ## JetBrains Rider
 
-If you need to develop Avalonia app with JetBrains Rider, go and *vote* on [this issue](https://youtrack.jetbrains.com/issue/RIDER-39247) in their tracker. JetBrains won't do things without their users telling them that they want the feature, so only **YOU** can make it happen.
+If you need to develop Avalonia app with JetBrains Rider you can use latest Rider [preview builds](https://www.jetbrains.com/rider/nextversion/).
 
 ## Bleeding Edge Builds
 

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()
+                .LogToTrace();
-                .Start<MainWindow>();
-        }
     }
 }

samples/ControlCatalog.Desktop/Program.cs

@@ -10,19 +10,15 @@ namespace ControlCatalog
     internal class Program
     {
         [STAThread]
-        static void Main(string[] args)
+        public static int Main(string[] args)
-        {
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-            // TODO: Make this work with GTK/Skia/Cairo depending on command-line args
-            // again.
-            BuildAvaloniaApp().Start<MainWindow>();
-        }
 
         /// <summary>
         /// This method is needed for IDE previewer infrastructure
         /// </summary>
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
-                .LogToDebug()
+                .LogToTrace()
                 .UsePlatformDetect()
                 .UseReactiveUI();
 

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -11,9 +11,8 @@
     <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" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
   </ItemGroup>
 
 

samples/ControlCatalog.NetCore/Program.cs

@@ -7,12 +7,11 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Dialogs;
 using Avalonia.Headless;
 using Avalonia.LogicalTree;
-using Avalonia.Skia;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
-using Avalonia.Dialogs;
 
 namespace ControlCatalog.NetCore
 {
@@ -121,7 +120,7 @@ namespace ControlCatalog.NetCore
                 .UseSkia()
                 .UseReactiveUI()
                 .UseManagedSystemDialogs()
-                .LogToDebug();
+                .LogToTrace();
 
         static void SilenceConsole()
         {

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

samples/Previewer/Program.cs

@@ -1,13 +1,14 @@
-using System;
+using Avalonia;
-using Avalonia;
 
 namespace Previewer
 {
     class Program
     {
-        static void Main(string[] args)
+        public static AppBuilder BuildAvaloniaApp()
-        {
+          => AppBuilder.Configure<App>()
-            AppBuilder.Configure<App>().UsePlatformDetect().Start<MainWindow>();
+                .UsePlatformDetect();
-        }
+
+        public static int Main(string[] args)
+          => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
-}
+}

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()
@@ -24,6 +33,6 @@ namespace RenderDemo
                })
                 .UsePlatformDetect()
                 .UseReactiveUI()
-                .LogToDebug();
+                .LogToTrace();
     }
 }

samples/RenderDemo/Pages/GlyphRunPage.xaml

@@ -6,9 +6,9 @@
              x:Class="RenderDemo.Pages.GlyphRunPage">
   <Border
     Background="White">
-    <DrawingPresenter
+    <Image
-      x:Name="drawingPresenter"
+      x:Name="imageControl"
       Stretch="None">
-    </DrawingPresenter>
+    </Image>
   </Border>
 </UserControl>

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

samples/Sandbox/Program.cs

@@ -10,7 +10,7 @@ namespace Sandbox
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .UseReactiveUI()
-                .LogToDebug()
+                .LogToTrace()
                 .StartWithClassicDesktopLifetime(args);
         }
     }

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

samples/VirtualizationDemo/Program.cs

@@ -1,19 +1,17 @@
-using System;
+using Avalonia;
-using Avalonia;
-using Avalonia.Controls;
 using Avalonia.ReactiveUI;
 
 namespace VirtualizationDemo
 {
     class Program
     {
-        static void Main(string[] args)
+        public static AppBuilder BuildAvaloniaApp()
-        {
+            => AppBuilder.Configure<App>()
-            AppBuilder.Configure<App>()
+                .UsePlatformDetect()
-               .UsePlatformDetect()
+                .UseReactiveUI()
-               .UseReactiveUI()
+                .LogToTrace();
-               .LogToDebug()
+
-               .Start<MainWindow>();
+        public static int Main(string[] args)
-        }
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }

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

samples/interop/Direct3DInteropSample/Program.cs

@@ -1,19 +1,16 @@
-using System;
+using Avalonia;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
 
 namespace Direct3DInteropSample
 {
     class Program
     {
-        static void Main(string[] args)
+        public static AppBuilder BuildAvaloniaApp()
-        {
+            => AppBuilder.Configure<App>()
-            AppBuilder.Configure<App>()
+                .With(new Win32PlatformOptions { UseDeferredRendering = false })
-                .With(new Win32PlatformOptions {UseDeferredRendering = false})
+                .UseWin32()
-                .UseWin32().UseDirect2D1().Start<MainWindow>();
+                .UseDirect2D1();
-        }
+
+        public static int Main(string[] args)
+            => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
 }

samples/interop/NativeEmbedSample/NativeEmbedSample.csproj

@@ -9,11 +9,10 @@
 
   <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" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
 
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>

src/Avalonia.Animation/Properties/AssemblyInfo.cs

@@ -6,5 +6,5 @@ using System.Runtime.CompilerServices;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
 
-[assembly: InternalsVisibleTo("Avalonia.LeakTests")]
+[assembly: InternalsVisibleTo("Avalonia.LeakTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Animation.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Avalonia.Base/ApiCompatBaseline.txt

@@ -1,3 +1,4 @@
 Compat issues with assembly Avalonia.Base:
 CannotAddAbstractMembers : Member 'protected System.IObservable<Avalonia.AvaloniaPropertyChangedEventArgs> Avalonia.AvaloniaProperty.GetChanged()' is abstract in the implementation but is missing in the contract.
-Total Issues: 1
+TypesMustExist : Type 'Avalonia.Logging.DebugLogSink' does not exist in the implementation but it does exist in the contract.
+Total Issues: 2

src/Avalonia.Base/Logging/DebugLogSink.cs → src/Avalonia.Base/Logging/TraceLogSink.cs

@@ -6,12 +6,12 @@ using Avalonia.Utilities;
 
 namespace Avalonia.Logging
 {
-    public class DebugLogSink : ILogSink
+    public class TraceLogSink : ILogSink
     {
         private readonly LogEventLevel _level;
         private readonly IList<string> _areas;
 
-        public DebugLogSink(
+        public TraceLogSink(
             LogEventLevel minimumLevel,
             IList<string> areas = null)
         {
@@ -28,7 +28,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Debug.WriteLine(Format<object, object, object>(area, messageTemplate, source));
+                Trace.WriteLine(Format<object, object, object>(area, messageTemplate, source));
             }
         }
 
@@ -36,7 +36,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Debug.WriteLine(Format<T0, object, object>(area, messageTemplate, source, propertyValue0));
+                Trace.WriteLine(Format<T0, object, object>(area, messageTemplate, source, propertyValue0));
             }
         }
 
@@ -44,7 +44,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Debug.WriteLine(Format<T0, T1, object>(area, messageTemplate, source, propertyValue0, propertyValue1));
+                Trace.WriteLine(Format<T0, T1, object>(area, messageTemplate, source, propertyValue0, propertyValue1));
             }
         }
 
@@ -52,7 +52,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Debug.WriteLine(Format(area, messageTemplate, source, propertyValue0, propertyValue1, propertyValue2));
+                Trace.WriteLine(Format(area, messageTemplate, source, propertyValue0, propertyValue1, propertyValue2));
             }
         }
 
@@ -60,7 +60,7 @@ namespace Avalonia.Logging
         {
             if (IsEnabled(level, area))
             {
-                Debug.WriteLine(Format(area, messageTemplate, source, propertyValues));
+                Trace.WriteLine(Format(area, messageTemplate, source, propertyValues));
             }
         }
 

src/Avalonia.Base/Metadata/XmlnsPrefixAttribute.cs

@@ -0,0 +1,39 @@
+using System;
+
+namespace Avalonia.Metadata
+{
+    /// <summary>
+    /// Use to predefine the prefix associated to an xml namespace in a xaml file
+    /// </summary>
+    /// <remarks>
+    /// example:
+    /// [assembly: XmlnsPrefix("https://github.com/avaloniaui", "av")]
+    /// xaml:
+    /// xmlns:av="https://github.com/avaloniaui"
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    public sealed class XmlnsPrefixAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="xmlNamespace">XML namespce</param>
+        /// <param name="prefix">recommended prefix</param>
+        public XmlnsPrefixAttribute(string xmlNamespace, string prefix)
+        {
+            XmlNamespace = xmlNamespace ?? throw new ArgumentNullException(nameof(xmlNamespace));
+
+            Prefix = prefix ?? throw new ArgumentNullException(nameof(prefix));
+        }
+
+        /// <summary>
+        /// XML Namespace
+        /// </summary>
+        public string XmlNamespace { get; }
+
+        /// <summary>
+        /// New Xml Namespace
+        /// </summary>
+        public string Prefix { get; }
+    }
+}

src/Avalonia.Base/Properties/AssemblyInfo.cs

@@ -5,8 +5,8 @@ using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
-[assembly: InternalsVisibleTo("Avalonia.Base.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Base.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
-[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj

@@ -59,7 +59,7 @@
       </Compile>
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" />
       <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" />
-      <PackageReference Include="Avalonia.Unofficial.Cecil" Version="20190417.2.0" PrivateAssets="All" />
+      <PackageReference Include="Mono.Cecil" Version="0.11.2" />
       <PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
     </ItemGroup>
 </Project>

src/Avalonia.Build.Tasks/CompileAvaloniaXamlTask.cs

@@ -39,7 +39,9 @@ namespace Avalonia.Build.Tasks
 
             var res = XamlCompilerTaskExecutor.Compile(BuildEngine, input,
                 File.ReadAllLines(ReferencesFilePath).Where(l => !string.IsNullOrWhiteSpace(l)).ToArray(),
-                ProjectDirectory, OutputPath, VerifyIl, outputImportance);
+                ProjectDirectory, OutputPath, VerifyIl, outputImportance,
+                (SignAssembly && !DelaySign) ? AssemblyOriginatorKeyFile : null
+                );
             if (!res.Success)
                 return false;
             if (!res.WrittenFile)
@@ -73,6 +75,10 @@ namespace Avalonia.Build.Tasks
         public string OutputPath { get; set; }
 
         public bool VerifyIl { get; set; }
+        
+        public string AssemblyOriginatorKeyFile { get; set; }
+        public bool SignAssembly { get; set; }
+        public bool DelaySign { get; set; }
 
         public string ReportImportance { get; set; }
 

src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs

@@ -42,7 +42,7 @@ namespace Avalonia.Build.Tasks
         }
         
         public static CompileResult Compile(IBuildEngine engine, string input, string[] references, string projectDirectory,
-            string output, bool verifyIl, MessageImportance logImportance)
+            string output, bool verifyIl, MessageImportance logImportance, string strongNameKey)
         {
             var typeSystem = new CecilTypeSystem(references.Concat(new[] {input}), input);
             var asm = typeSystem.TargetAssemblyDefinition;
@@ -345,6 +345,20 @@ namespace Avalonia.Build.Tasks
                     }
                     res.Remove();
                 }
+                
+                
+                // Technically that's a hack, but it fixes corert incompatibility caused by deterministic builds
+                int dupeCounter = 1;
+                foreach (var grp in typeDef.NestedTypes.GroupBy(x => x.Name))
+                {
+                    if (grp.Count() > 1)
+                    {
+                        foreach (var dupe in grp)
+                            dupe.Name += "_dup" + dupeCounter++;
+                    }
+                }
+                
+                
                 return true;
             }
             
@@ -361,10 +375,12 @@ namespace Avalonia.Build.Tasks
             loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ldnull));
             loaderDispatcherMethod.Body.Instructions.Add(Instruction.Create(OpCodes.Ret));
             
-            asm.Write(output, new WriterParameters
+            
-            {
+            var writerParameters = new WriterParameters { WriteSymbols = asm.MainModule.HasSymbols };
-                WriteSymbols = asm.MainModule.HasSymbols
+            if (!string.IsNullOrWhiteSpace(strongNameKey))
-            });
+                writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
+
+            asm.Write(output, writerParameters);
 
             return new CompileResult(true, true);
         }

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>

src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs

@@ -340,8 +340,6 @@ namespace Avalonia.Controls
 
             if (OwningGrid != null && OwningGrid.ColumnHeaders != null)
             {
-                args.Pointer.Capture(this);
-
                 _dragMode = DragMode.MouseDown;
                 _frozenColumnsWidth = OwningGrid.ColumnsInternal.GetVisibleFrozenEdgedColumnsWidth();
                 _lastMousePositionHeaders = this.Translate(OwningGrid.ColumnHeaders, mousePosition);
@@ -413,8 +411,9 @@ namespace Avalonia.Controls
         }
 
         //TODO DragEvents
-        internal void OnMouseMove(ref bool handled, Point mousePosition, Point mousePositionHeaders)
+        internal void OnMouseMove(PointerEventArgs args, Point mousePosition, Point mousePositionHeaders)
         {
+            var handled = args.Handled;
             if (handled || OwningGrid == null || OwningGrid.ColumnHeaders == null)
             {
                 return;
@@ -438,7 +437,10 @@ namespace Avalonia.Controls
             }
 
             _lastMousePositionHeaders = mousePositionHeaders;
-
+            
+            if (args.Pointer.Captured != this)
+                args.Pointer.Capture(this);
+            
             SetDragCursor(mousePosition);
         }
 
@@ -506,8 +508,7 @@ namespace Avalonia.Controls
             Point mousePosition = e.GetPosition(this);
             Point mousePositionHeaders = e.GetPosition(OwningGrid.ColumnHeaders);
 
-            bool handled = false;
+            OnMouseMove(e, mousePosition, mousePositionHeaders);
-            OnMouseMove(ref handled, mousePosition, mousePositionHeaders);
         }
 
         /// <summary>

src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs

@@ -2,8 +2,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.DataGrid.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Collections")]

src/Avalonia.Controls/ApiCompatBaseline.txt

@@ -8,6 +8,12 @@ MembersMustExist : Member 'public void Avalonia.Controls.ListBox.Selection.set(A
 TypesMustExist : Type 'Avalonia.Controls.SelectionModel' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'Avalonia.Controls.SelectionModelChildrenRequestedEventArgs' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'Avalonia.Controls.SelectionModelSelectionChangedEventArgs' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Controls.IControl> Avalonia.StyledProperty<Avalonia.Controls.IControl> Avalonia.Controls.SplitView.ContentProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Controls.IControl> Avalonia.StyledProperty<Avalonia.Controls.IControl> Avalonia.Controls.SplitView.PaneProperty' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Controls.IControl Avalonia.Controls.SplitView.Content.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.SplitView.Content.set(Avalonia.Controls.IControl)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Controls.IControl Avalonia.Controls.SplitView.Pane.get()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public void Avalonia.Controls.SplitView.Pane.set(Avalonia.Controls.IControl)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.DirectProperty<Avalonia.Controls.TreeView, Avalonia.Controls.ISelectionModel> Avalonia.DirectProperty<Avalonia.Controls.TreeView, Avalonia.Controls.ISelectionModel> Avalonia.Controls.TreeView.SelectionProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Interactivity.RoutedEvent<Avalonia.Controls.SelectionChangedEventArgs> Avalonia.Interactivity.RoutedEvent<Avalonia.Controls.SelectionChangedEventArgs> Avalonia.Controls.TreeView.SelectionChangedEvent' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Controls.ISelectionModel Avalonia.Controls.TreeView.Selection.get()' does not exist in the implementation but it does exist in the contract.
@@ -17,4 +23,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.String[] Avalo
 MembersMustExist : Member 'public Avalonia.DirectProperty<Avalonia.Controls.Primitives.SelectingItemsControl, Avalonia.Controls.ISelectionModel> Avalonia.DirectProperty<Avalonia.Controls.Primitives.SelectingItemsControl, Avalonia.Controls.ISelectionModel> Avalonia.Controls.Primitives.SelectingItemsControl.SelectionProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected Avalonia.Controls.ISelectionModel Avalonia.Controls.Primitives.SelectingItemsControl.Selection.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'protected void Avalonia.Controls.Primitives.SelectingItemsControl.Selection.set(Avalonia.Controls.ISelectionModel)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 18
+Total Issues: 24

src/Avalonia.Controls/ContextMenu.cs

@@ -62,6 +62,12 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<Rect?> PlacementRectProperty =
             AvaloniaProperty.Register<Popup, Rect?>(nameof(PlacementRect));
 
+        /// <summary>
+        /// Defines the <see cref="WindowManagerAddShadowHint"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> WindowManagerAddShadowHintProperty  =
+            Popup.WindowManagerAddShadowHintProperty.AddOwner<ContextMenu>();
+
         /// <summary>
         /// Defines the <see cref="PlacementTarget"/> property.
         /// </summary>
@@ -158,6 +164,12 @@ namespace Avalonia.Controls
             set { SetValue(PlacementModeProperty, value); }
         }
 
+        public bool WindowManagerAddShadowHint
+        {
+            get { return GetValue(WindowManagerAddShadowHintProperty); }
+            set { SetValue(WindowManagerAddShadowHintProperty, value); }
+        }
+
         /// <summary>
         /// Gets or sets the the anchor rectangle within the parent that the context menu will be placed
         /// relative to when <see cref="PlacementMode"/> is <see cref="PlacementMode.AnchorAndGravity"/>.
@@ -267,6 +279,7 @@ namespace Avalonia.Controls
                     PlacementTarget = PlacementTarget ?? control,
                     IsLightDismissEnabled = true,
                     OverlayDismissEventPassThrough = true,
+                    WindowManagerAddShadowHint = WindowManagerAddShadowHint,
                 };
 
                 _popup.Opened += PopupOpened;

src/Avalonia.Controls/ItemsControl.cs

@@ -169,7 +169,7 @@ namespace Avalonia.Controls
         /// </summary>
         /// <param name="items">The collection.</param>
         /// <param name="index">The index.</param>
-        /// <returns>The index of the item or -1 if the item was not found.</returns>
+        /// <returns>The item at the given index or null if the index is out of bounds.</returns>
         protected static object ElementAt(IEnumerable items, int index)
         {
             if (index != -1 && index < items.Count())

src/Avalonia.Controls/LoggingExtensions.cs

@@ -1,25 +1,36 @@
-using Avalonia.Controls;
+using System;
+using Avalonia.Controls;
 using Avalonia.Logging;
 
 namespace Avalonia
 {
     public static class LoggingExtensions
     {
+        [Obsolete("Use LogToTrace")]
+        public static T LogToDebug<T>(
+            this T builder,
+            LogEventLevel level = LogEventLevel.Warning,
+            params string[] areas)
+                where T : AppBuilderBase<T>, new()
+        {
+            return LogToTrace(builder, level, areas);
+        }
+
         /// <summary>
-        /// Logs Avalonia events to the <see cref="System.Diagnostics.Debug"/> sink.
+        /// Logs Avalonia events to the <see cref="System.Diagnostics.Trace"/> sink.
         /// </summary>
         /// <typeparam name="T">The application class type.</typeparam>
         /// <param name="builder">The app builder instance.</param>
         /// <param name="level">The minimum level to log.</param>
         /// <param name="areas">The areas to log. Valid values are listed in <see cref="LogArea"/>.</param>
         /// <returns>The app builder instance.</returns>
-        public static T LogToDebug<T>(
+        public static T LogToTrace<T>(
             this T builder,
             LogEventLevel level = LogEventLevel.Warning,
             params string[] areas)
                 where T : AppBuilderBase<T>, new()
         {
-            Logger.Sink = new DebugLogSink(level, areas);
+            Logger.Sink = new TraceLogSink(level, areas);
             return builder;
         }
     }

src/Avalonia.Controls/Presenters/ItemVirtualizerSimple.cs

@@ -512,6 +512,13 @@ namespace Avalonia.Controls.Presenters
             var generator = Owner.ItemContainerGenerator;
             var newOffset = -1.0;
 
+            //better not trigger any container generation/recycle while  or layout stuff
+            //before panel is attached/visible
+            if (!panel.IsAttachedToVisualTree)
+            {
+                return null;
+            }
+
             if (!panel.IsMeasureValid && panel.PreviousMeasure.HasValue)
             {
                 //before any kind of scrolling we need to make sure panel measure is valid

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>

src/Avalonia.Controls/Primitives/SelectingItemsControl.cs

@@ -790,18 +790,13 @@ namespace Avalonia.Controls.Primitives
         /// <param name="e">The event.</param>
         private void ContainerSelectionChanged(RoutedEventArgs e)
         {
-            if (!_ignoreContainerSelectionChanged)
+            if (!_ignoreContainerSelectionChanged &&
+                e.Source is IControl control &&
+                e.Source is ISelectable selectable &&
+                control.LogicalParent == this &&
+                ItemContainerGenerator?.IndexFromContainer(control) != -1)
             {
-                var control = e.Source as IControl;
+                UpdateSelection(control, selectable.IsSelected);
-                var selectable = e.Source as ISelectable;
-
-                if (control != null &&
-                    selectable != null &&
-                    control.LogicalParent == this &&
-                    ItemContainerGenerator?.IndexFromContainer(control) != -1)
-                {
-                    UpdateSelection(control, selectable.IsSelected);
-                }
             }
 
             if (e.Source != this)
@@ -820,12 +815,11 @@ namespace Avalonia.Controls.Primitives
         {
             try
             {
-                var selectable = container as ISelectable;
                 bool result;
 
                 _ignoreContainerSelectionChanged = true;
 
-                if (selectable != null)
+                if (container is ISelectable selectable)
                 {
                     result = selectable.IsSelected;
                     selectable.IsSelected = selected;

src/Avalonia.Controls/Properties/AssemblyInfo.cs

@@ -2,8 +2,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
+[assembly: InternalsVisibleTo("Avalonia.DesignerSupport, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]

src/Avalonia.Controls/SplitView.cs

@@ -9,6 +9,8 @@ using Avalonia.Platform;
 using Avalonia.VisualTree;
 using System;
 using System.Reactive.Disposables;
+using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls
 {
@@ -78,7 +80,7 @@ namespace Avalonia.Controls
     [PseudoClasses(":compactoverlay", ":compactinline", ":overlay", ":inline")]
     [PseudoClasses(":left", ":right")]
     [PseudoClasses(":lightdismiss")]
-    public class SplitView : TemplatedControl
+    public class SplitView : ContentControl
     {
         /*
             Pseudo classes & combos
@@ -87,12 +89,6 @@ namespace Avalonia.Controls
             :left :right
         */
 
-        /// <summary>
-        /// Defines the <see cref="Content"/> property
-        /// </summary>
-        public static readonly StyledProperty<IControl> ContentProperty =
-            AvaloniaProperty.Register<SplitView, IControl>(nameof(Content));
-
         /// <summary>
         /// Defines the <see cref="CompactPaneLength"/> property
         /// </summary>
@@ -133,8 +129,14 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="Pane"/> property
         /// </summary>
-        public static readonly StyledProperty<IControl> PaneProperty =
+        public static readonly StyledProperty<object?> PaneProperty =
-            AvaloniaProperty.Register<SplitView, IControl>(nameof(Pane));
+            AvaloniaProperty.Register<SplitView, object?>(nameof(Pane));
+
+        /// <summary>
+        /// Defines the <see cref="HeaderTemplate"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IDataTemplate?> PaneTemplateProperty =
+            AvaloniaProperty.Register<HeaderedContentControl, IDataTemplate?>(nameof(PaneTemplate));
 
         /// <summary>
         /// Defines the <see cref="UseLightDismissOverlayMode"/> property
@@ -166,16 +168,7 @@ namespace Avalonia.Controls
             CompactPaneLengthProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnCompactPaneLengthChanged(v));
             PanePlacementProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnPanePlacementChanged(v));
             DisplayModeProperty.Changed.AddClassHandler<SplitView>((x, v) => x.OnDisplayModeChanged(v));
-        }
+            
-
-        /// <summary>
-        /// Gets or sets the content of the SplitView
-        /// </summary>
-        [Content]
-        public IControl Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
         }
 
         /// <summary>
@@ -265,11 +258,20 @@ namespace Avalonia.Controls
         /// <summary>
         /// Gets or sets the Pane for the SplitView
         /// </summary>
-        public IControl Pane
+        public object Pane
         {
             get => GetValue(PaneProperty);
             set => SetValue(PaneProperty, value);
         }
+        
+        /// <summary>
+        /// Gets or sets the data template used to display the header content of the control.
+        /// </summary>
+        public IDataTemplate? PaneTemplate
+        {
+            get => GetValue(PaneTemplateProperty);
+            set => SetValue(PaneTemplateProperty, value);
+        }
 
         /// <summary>
         /// Gets or sets whether WinUI equivalent LightDismissOverlayMode is enabled
@@ -312,6 +314,18 @@ namespace Avalonia.Controls
         /// </summary>
         public event EventHandler<EventArgs> PaneOpening;
 
+        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        {
+            var result = base.RegisterContentPresenter(presenter);
+
+            if (presenter.Name == "PART_PanePresenter")
+            {
+                return true;
+            }
+            
+            return result;
+        }
+
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);

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.

src/Avalonia.Dialogs/ApiCompatBaseline.txt

@@ -0,0 +1 @@
+Total Issues: 0

src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@@ -6,9 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <PackageReference Include="Tmds.DBus" Version="0.9.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Tmds.DBus" Version="0.7.0" />
-  </ItemGroup>  
 </Project>

src/Avalonia.Input/MouseDevice.cs

@@ -19,6 +19,7 @@ namespace Avalonia.Input
 
         private readonly Pointer _pointer;
         private bool _disposed;
+        private PixelPoint? _position; 
 
         public MouseDevice(Pointer? pointer = null)
         {
@@ -39,10 +40,11 @@ namespace Avalonia.Input
         /// <summary>
         /// Gets the mouse position, in screen coordinates.
         /// </summary>
+        [Obsolete("Use events instead")]
         public PixelPoint Position
         {
-            get;
+            get => _position ?? new PixelPoint(-1, -1);
-            protected set;
+            protected set => _position = value;
         }
 
         /// <summary>
@@ -91,7 +93,16 @@ namespace Avalonia.Input
 
         public void SceneInvalidated(IInputRoot root, Rect rect)
         {
-            var clientPoint = root.PointToClient(Position);
+            // Pointer is outside of the target area
+            if (_position == null )
+            {
+                if (root.PointerOverElement != null)
+                    ClearPointerOver(this, 0, root, PointerPointProperties.None, KeyModifiers.None);
+                return;
+            }
+            
+            
+            var clientPoint = root.PointToClient(_position.Value);
 
             if (rect.Contains(clientPoint))
             {
@@ -132,7 +143,7 @@ namespace Avalonia.Input
             if(mouse._disposed)
                 return;
 
-            Position = e.Root.PointToScreen(e.Position);
+            _position = e.Root.PointToScreen(e.Position);
             var props = CreateProperties(e);
             var keyModifiers = KeyModifiersUtils.ConvertToKey(e.InputModifiers);
             switch (e.Type)
@@ -176,6 +187,7 @@ namespace Avalonia.Input
             device = device ?? throw new ArgumentNullException(nameof(device));
             root = root ?? throw new ArgumentNullException(nameof(root));
 
+            _position = null;
             ClearPointerOver(this, timestamp, root, properties, inputModifiers);
         }
 

src/Avalonia.Layout/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Layout.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Layout")]
 

src/Avalonia.Native/WindowImplBase.cs

@@ -251,6 +251,9 @@ namespace Avalonia.Native
 
         public bool RawTextInputEvent(uint timeStamp, string text)
         {
+            if (_inputRoot is null) 
+                return false;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             var args = new RawTextInputEventArgs(_keyboard, timeStamp, _inputRoot, text);
@@ -262,6 +265,9 @@ namespace Avalonia.Native
 
         public bool RawKeyEvent(AvnRawKeyEventType type, uint timeStamp, AvnInputModifiers modifiers, uint key)
         {
+            if (_inputRoot is null) 
+                return false;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             var args = new RawKeyEventArgs(_keyboard, timeStamp, _inputRoot, (RawKeyEventType)type, (Key)key, (RawInputModifiers)modifiers);
@@ -278,6 +284,9 @@ namespace Avalonia.Native
 
         public void RawMouseEvent(AvnRawMouseEventType type, uint timeStamp, AvnInputModifiers modifiers, AvnPoint point, AvnVector delta)
         {
+            if (_inputRoot is null) 
+                return;
+            
             Dispatcher.UIThread.RunJobs(DispatcherPriority.Input + 1);
 
             switch (type)

src/Avalonia.OpenGL/Angle/AngleEglInterface.cs

@@ -1,15 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
 using Avalonia.OpenGL.Egl;
-using Avalonia.Platform;
-using Avalonia.Platform.Interop;
 
 namespace Avalonia.OpenGL.Angle
 {
     public class AngleEglInterface : EglInterface
     {
-        [DllImport("libegl.dll", CharSet = CharSet.Ansi)]
+        [DllImport("av_libGLESv2.dll", CharSet = CharSet.Ansi)]
-        static extern IntPtr eglGetProcAddress(string proc);
+        static extern IntPtr EGL_GetProcAddress(string proc);
 
         public AngleEglInterface() : base(LoadAngle())
         {
@@ -20,14 +18,14 @@ namespace Avalonia.OpenGL.Angle
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                var disp = eglGetProcAddress("eglGetPlatformDisplayEXT");
+                var disp = EGL_GetProcAddress("eglGetPlatformDisplayEXT");
 
                 if (disp == IntPtr.Zero)
                 {
                     throw new OpenGlException("libegl.dll doesn't have eglGetPlatformDisplayEXT entry point");
                 }
 
-                return eglGetProcAddress;
+                return EGL_GetProcAddress;
             }
             
             throw new PlatformNotSupportedException();

src/Avalonia.OpenGL/Angle/AngleWin32EglDisplay.cs

@@ -82,7 +82,14 @@ namespace Avalonia.OpenGL.Angle
         {
             if (PlatformApi != AngleOptions.PlatformApi.DirectX11)
                 throw new InvalidOperationException("Current platform API is " + PlatformApi);
-            return  egl.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, handle, new[] { EGL_NONE, EGL_NONE });
+            return  egl.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, handle, new[] { EGL_NONE, EGL_NONE });            
+        }
+
+        public EglSurface WrapDirect3D11Texture(EglPlatformOpenGlInterface egl, IntPtr handle, int offsetX, int offsetY, int width, int height)
+        {
+            if (PlatformApi != AngleOptions.PlatformApi.DirectX11)
+                throw new InvalidOperationException("Current platform API is " + PlatformApi);
+            return egl.CreatePBufferFromClientBuffer(EGL_D3D_TEXTURE_ANGLE, handle, new[] { EGL_WIDTH, width, EGL_HEIGHT, height, EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_TRUE, EGL_TEXTURE_OFFSET_X_ANGLE, offsetX, EGL_TEXTURE_OFFSET_Y_ANGLE, offsetY, EGL_NONE });
         }
     }
 }

src/Avalonia.OpenGL/Egl/EglConsts.cs

@@ -205,5 +205,11 @@ namespace Avalonia.OpenGL.Egl
 
         public const int EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE = 0x3200;
         public const int EGL_D3D_TEXTURE_ANGLE = 0x33A3;
+
+
+        public const int EGL_TEXTURE_OFFSET_X_ANGLE = 0x3490;
+        public const int EGL_TEXTURE_OFFSET_Y_ANGLE = 0x3491;
+
+        public const int EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE = 0x33A6;
     }
 }

src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>Avalonia.ReactiveUI</PackageId>
+    <SignAssembly>True</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />

src/Avalonia.Styling/Properties/AssemblyInfo.cs

@@ -5,4 +5,4 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.LogicalTree")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Styling")]
-[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Styling.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Avalonia.Themes.Default/SplitView.xaml

@@ -32,12 +32,12 @@
                  ClipToBounds="True"
                  HorizontalAlignment="Left"
                  ZIndex="100">
-            <Border Child="{TemplateBinding Pane}"/>
+            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
             <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
           </Panel>
 
           <Panel Name="ContentRoot">
-            <Border Child="{TemplateBinding Content}" />
+            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
             <Rectangle Name="LightDismissLayer"/>
           </Panel>
 
@@ -106,14 +106,14 @@
                  ClipToBounds="True"
                  HorizontalAlignment="Right"
                  ZIndex="100">
-            <Border Child="{TemplateBinding Pane}"/>
+            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
             <Rectangle Name="HCPaneBorder"
                        Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
                        Width="1" HorizontalAlignment="Left"  />
           </Panel>
 
           <Panel Name="ContentRoot">
-            <Border Child="{TemplateBinding Content}" />
+            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
             <Rectangle Name="LightDismissLayer"/>
           </Panel>
 

src/Avalonia.Themes.Fluent/SplitView.xaml

@@ -32,12 +32,12 @@
                  ClipToBounds="True"
                  HorizontalAlignment="Left"
                  ZIndex="100">
-            <Border Child="{TemplateBinding Pane}"/>
+            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}" />
             <Rectangle Name="HCPaneBorder" Fill="{DynamicResource SystemControlForegroundTransparentBrush}" Width="1" HorizontalAlignment="Right"  />
           </Panel>
 
           <Panel Name="ContentRoot">
-            <Border Child="{TemplateBinding Content}" />
+            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
             <Rectangle Name="LightDismissLayer"/>
           </Panel>
 
@@ -106,14 +106,14 @@
                  ClipToBounds="True"
                  HorizontalAlignment="Right"
                  ZIndex="100">
-            <Border Child="{TemplateBinding Pane}"/>
+            <ContentPresenter x:Name="PART_PanePresenter" Content="{TemplateBinding Pane}" ContentTemplate="{TemplateBinding PaneTemplate}"/>
             <Rectangle Name="HCPaneBorder"
                        Fill="{DynamicResource SystemControlForegroundTransparentBrush}"
                        Width="1" HorizontalAlignment="Left"  />
           </Panel>
 
           <Panel Name="ContentRoot">
-            <Border Child="{TemplateBinding Content}" />
+            <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
             <Rectangle Name="LightDismissLayer"/>
           </Panel>
 

src/Avalonia.Visuals/ApiCompatBaseline.txt

@@ -2,6 +2,8 @@ Compat issues with assembly Avalonia.Visuals:
 MembersMustExist : Member 'public void Avalonia.Media.DrawingContext.DrawGlyphRun(Avalonia.Media.IBrush, Avalonia.Media.GlyphRun, Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Media.Typeface Avalonia.Media.FontManager.GetOrAddTypeface(Avalonia.Media.FontFamily, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Media.Typeface Avalonia.Media.FontManager.MatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.Geometry.GetRenderBounds(Avalonia.Media.Pen)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public System.Boolean Avalonia.Media.Geometry.StrokeContains(Avalonia.Media.Pen, Avalonia.Point)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Rect Avalonia.Media.GlyphRun.Bounds.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.StyledProperty<Avalonia.Point> Avalonia.StyledProperty<Avalonia.Point> Avalonia.Media.GlyphRunDrawing.BaselineOriginProperty' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public Avalonia.Point Avalonia.Media.GlyphRunDrawing.BaselineOrigin.get()' does not exist in the implementation but it does exist in the contract.
@@ -34,4 +36,4 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalon
 MembersMustExist : Member 'public System.Boolean Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Fonts.FontKey)' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalonia.Platform.IFontManagerImpl.TryMatchCharacter(System.Int32, Avalonia.Media.FontStyle, Avalonia.Media.FontWeight, Avalonia.Media.FontFamily, System.Globalization.CultureInfo, Avalonia.Media.Typeface)' is present in the implementation but not in the contract.
 MembersMustExist : Member 'public Avalonia.Utilities.IRef<Avalonia.Platform.IRenderTargetBitmapImpl> Avalonia.Rendering.RenderLayer.Bitmap.get()' does not exist in the implementation but it does exist in the contract.
-Total Issues: 35
+Total Issues: 37

src/Avalonia.Visuals/Media/Drawing.cs

@@ -1,11 +1,19 @@
-using Avalonia.Platform;
+namespace Avalonia.Media
-
-namespace Avalonia.Media
 {
+    /// <summary>
+    /// Abstract class that describes a 2-D drawing.
+    /// </summary>
     public abstract class Drawing : AvaloniaObject
     {
+        /// <summary>
+        /// Draws this drawing to the given <see cref="DrawingContext"/>.
+        /// </summary>
+        /// <param name="context">The drawing context.</param>
         public abstract void Draw(DrawingContext context);
 
+        /// <summary>
+        /// Gets the drawing's bounding rectangle.
+        /// </summary>
         public abstract Rect GetBounds();
     }
 }

src/Avalonia.Visuals/Media/Geometry.cs

@@ -84,7 +84,7 @@ namespace Avalonia.Media
         /// </summary>
         /// <param name="pen">The stroke thickness.</param>
         /// <returns>The bounding rectangle.</returns>
-        public Rect GetRenderBounds(Pen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
+        public Rect GetRenderBounds(IPen pen) => PlatformImpl?.GetRenderBounds(pen) ?? Rect.Empty;
 
         /// <summary>
         /// Indicates whether the geometry's fill contains the specified point.
@@ -102,7 +102,7 @@ namespace Avalonia.Media
         /// <param name="pen">The pen to use.</param>
         /// <param name="point">The point.</param>
         /// <returns><c>true</c> if the geometry contains the point; otherwise, <c>false</c>.</returns>
-        public bool StrokeContains(Pen pen, Point point)
+        public bool StrokeContains(IPen pen, Point point)
         {
             return PlatformImpl?.StrokeContains(pen, point) == true;
         }

src/Avalonia.Visuals/Media/GeometryDrawing.cs

@@ -1,12 +1,38 @@
-using Avalonia.Metadata;
+using Avalonia.Media.Immutable;
+using Avalonia.Metadata;
 
 namespace Avalonia.Media
 {
+    /// <summary>
+    /// Represents a drawing operation that combines 
+    /// a geometry with and brush and/or pen to produce rendered content.
+    /// </summary>
     public class GeometryDrawing : Drawing
     {
+        // Adding the Pen's stroke thickness here could yield wrong results due to transforms.
+        private static readonly IPen s_boundsPen = new ImmutablePen(Colors.Black.ToUint32(), 0);
+
+        /// <summary>
+        /// Defines the <see cref="Geometry"/> property.
+        /// </summary>
         public static readonly StyledProperty<Geometry> GeometryProperty =
             AvaloniaProperty.Register<GeometryDrawing, Geometry>(nameof(Geometry));
 
+        /// <summary>
+        /// Defines the <see cref="Brush"/> property.
+        /// </summary>
+        public static readonly StyledProperty<IBrush> BrushProperty =
+            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
+
+        /// <summary>
+        /// Defines the <see cref="Pen"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Pen> PenProperty =
+            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
+
+        /// <summary>
+        /// Gets or sets the <see cref="Avalonia.Media.Geometry"/> that describes the shape of this <see cref="GeometryDrawing"/>.
+        /// </summary>
         [Content]
         public Geometry Geometry
         {
@@ -14,18 +40,18 @@ namespace Avalonia.Media
             set => SetValue(GeometryProperty, value);
         }
 
-        public static readonly StyledProperty<IBrush> BrushProperty =
+        /// <summary>
-            AvaloniaProperty.Register<GeometryDrawing, IBrush>(nameof(Brush), Brushes.Transparent);
+        /// Gets or sets the <see cref="Avalonia.Media.IBrush"/> used to fill the interior of the shape described by this <see cref="GeometryDrawing"/>.
-
+        /// </summary>
         public IBrush Brush
         {
             get => GetValue(BrushProperty);
             set => SetValue(BrushProperty, value);
         }
 
-        public static readonly StyledProperty<Pen> PenProperty =
+        /// <summary>
-            AvaloniaProperty.Register<GeometryDrawing, Pen>(nameof(Pen));
+        /// Gets or sets the <see cref="Avalonia.Media.IPen"/> used to stroke this <see cref="GeometryDrawing"/>.
-
+        /// </summary>
         public IPen Pen
         {
             get => GetValue(PenProperty);
@@ -42,9 +68,7 @@ namespace Avalonia.Media
 
         public override Rect GetBounds()
         {
-            // adding the Pen's stroke thickness here could yield wrong results due to transforms
+            return Geometry?.GetRenderBounds(s_boundsPen) ?? Rect.Empty;
-            var pen = new Pen(Brushes.Black, 0);
-            return Geometry?.GetRenderBounds(pen) ?? new Rect();
         }
     }
 }

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>

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.

src/Avalonia.Visuals/Properties/AssemblyInfo.cs

@@ -2,13 +2,13 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using Avalonia.Metadata;
 
-[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Visuals.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Imaging")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Media.Transformation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
 
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Avalonia.Visuals/Rendering/RenderLayer.cs

@@ -30,12 +30,12 @@ namespace Avalonia.Rendering
         {
             if (Size != size || Scaling != scaling)
             {
-                Bitmap.Dispose();
                 var resized = RefCountable.Create(drawingContext.CreateLayer(size));
 
                 using (var context = resized.Item.CreateDrawingContext(null))
                 {
-                    context.Clear(Colors.Transparent);
+                    Bitmap.Dispose();
+                    context.Clear(default);
                     
                     Bitmap = resized;
                     Scaling = scaling;

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>

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

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

src/Avalonia.X11/XI2Manager.cs

@@ -13,7 +13,10 @@ namespace Avalonia.X11
         {
             XiEventType.XI_Motion,
             XiEventType.XI_ButtonPress,
-            XiEventType.XI_ButtonRelease
+            XiEventType.XI_ButtonRelease,
+            XiEventType.XI_Leave,
+            XiEventType.XI_Enter,
+            
         };
 
         private static readonly XiEventType[] MultiTouchEventTypes = new XiEventType[]
@@ -162,7 +165,9 @@ namespace Avalonia.X11
                    | XEventMask.Button4MotionMask
                    | XEventMask.Button5MotionMask
                    | XEventMask.ButtonPressMask
-                   | XEventMask.ButtonReleaseMask;
+                   | XEventMask.ButtonReleaseMask
+                   | XEventMask.LeaveWindowMask
+                   | XEventMask.EnterWindowMask;
         }
 
         public void OnWindowDestroyed(IntPtr xid) => _clients.Remove(xid);
@@ -175,14 +180,39 @@ namespace Avalonia.X11
                 _pointerDevice.Update(changed->Classes, changed->NumClasses);
             }
 
-            
+
             if ((xev->evtype >= XiEventType.XI_ButtonPress && xev->evtype <= XiEventType.XI_Motion)
-                || (xev->evtype>=XiEventType.XI_TouchBegin&&xev->evtype<=XiEventType.XI_TouchEnd))
+                || (xev->evtype >= XiEventType.XI_TouchBegin && xev->evtype <= XiEventType.XI_TouchEnd))
             {
                 var dev = (XIDeviceEvent*)xev;
                 if (_clients.TryGetValue(dev->EventWindow, out var client))
                     OnDeviceEvent(client, new ParsedDeviceEvent(dev));
             }
+
+            if (xev->evtype == XiEventType.XI_Leave || xev->evtype == XiEventType.XI_Enter)
+            {
+                var rev = (XIEnterLeaveEvent*)xev;
+                if (_clients.TryGetValue(rev->EventWindow, out var client))
+                    OnEnterLeaveEvent(client, ref *rev);
+            }
+        }
+
+        void OnEnterLeaveEvent(IXI2Client client, ref XIEnterLeaveEvent ev)
+        {
+            if (ev.evtype == XiEventType.XI_Leave)
+            {
+                var buttons = ParsedDeviceEvent.ParseButtonState(ev.buttons.MaskLen, ev.buttons.Mask);
+                var detail = ev.detail;
+                if ((detail == XiEnterLeaveDetail.XINotifyNonlinearVirtual ||
+                     detail == XiEnterLeaveDetail.XINotifyNonlinear ||
+                     detail == XiEnterLeaveDetail.XINotifyVirtual)
+                    && buttons == default)
+                {
+                    client.ScheduleXI2Input(new RawPointerEventArgs(client.MouseDevice, (ulong)ev.time.ToInt64(),
+                        client.InputRoot,
+                        RawPointerEventType.LeaveWindow, new Point(ev.event_x, ev.event_y), buttons));
+                }
+            }
         }
 
         void OnDeviceEvent(IXI2Client client, ParsedDeviceEvent ev)
@@ -284,6 +314,29 @@ namespace Avalonia.X11
         public int Detail { get; set; }
         public bool Emulated { get; set; }
         public Dictionary<int, double> Valuators { get; }
+
+        public static RawInputModifiers ParseButtonState(int len, byte* buttons)
+        {
+            RawInputModifiers rv = default;
+            if (len > 0)
+            {
+                if (XIMaskIsSet(buttons, 1))
+                    rv |= RawInputModifiers.LeftMouseButton;
+                if (XIMaskIsSet(buttons, 2))
+                    rv |= RawInputModifiers.MiddleMouseButton;
+                if (XIMaskIsSet(buttons, 3))
+                    rv |= RawInputModifiers.RightMouseButton;
+                if (len > 1)
+                {
+                    if (XIMaskIsSet(buttons, 8))
+                        rv |= RawInputModifiers.XButton1MouseButton;
+                    if (XIMaskIsSet(buttons, 9))
+                        rv |= RawInputModifiers.XButton2MouseButton;
+                }
+            }
+            return rv;
+        }
+        
         public ParsedDeviceEvent(XIDeviceEvent* ev)
         {
             Type = ev->evtype;
@@ -298,27 +351,16 @@ namespace Avalonia.X11
             if (state.HasFlag(XModifierMask.Mod4Mask))
                 Modifiers |= RawInputModifiers.Meta;
 
-            if (ev->buttons.MaskLen > 0)
+            Modifiers = ParseButtonState(ev->buttons.MaskLen, ev->buttons.Mask);
-            {
-                var buttons = ev->buttons.Mask;
-                if (XIMaskIsSet(buttons, 1))
-                    Modifiers |= RawInputModifiers.LeftMouseButton;
-                if (XIMaskIsSet(buttons, 2))
-                    Modifiers |= RawInputModifiers.MiddleMouseButton;
-                if (XIMaskIsSet(buttons, 3))
-                    Modifiers |= RawInputModifiers.RightMouseButton;
-                if (XIMaskIsSet(buttons, 8))
-                    Modifiers |= RawInputModifiers.XButton1MouseButton;
-                if (XIMaskIsSet(buttons, 9))
-                    Modifiers |= RawInputModifiers.XButton2MouseButton;
-            }
 
             Valuators = new Dictionary<int, double>();
             Position = new Point(ev->event_x, ev->event_y);
             var values = ev->valuators.Values;
-            for (var c = 0; c < ev->valuators.MaskLen * 8; c++)
+            if(ev->valuators.Mask != null)
-                if (XIMaskIsSet(ev->valuators.Mask, c))
+                for (var c = 0; c < ev->valuators.MaskLen * 8; c++)
-                    Valuators[c] = *values++;
+                    if (XIMaskIsSet(ev->valuators.Mask, c))
+                        Valuators[c] = *values++;
+            
             if (Type == XiEventType.XI_ButtonPress || Type == XiEventType.XI_ButtonRelease)
                 Button = ev->detail;
             Detail = ev->detail;

src/Avalonia.X11/XIStructs.cs

@@ -236,6 +236,34 @@ namespace Avalonia.X11
         public XIModifierState mods;
         public XIModifierState group;
     }
+    
+    [StructLayout(LayoutKind.Sequential)]
+    unsafe struct XIEnterLeaveEvent
+    {
+        public XEventName type; /* GenericEvent */
+        public UIntPtr serial; /* # of last request processed by server */
+        public Bool send_event; /* true if this came from a SendEvent request */
+        public IntPtr display; /* Display the event was read from */
+        public int extension; /* XI extension offset */
+        public XiEventType evtype;
+        public IntPtr time;
+        public int deviceid;
+        public int sourceid;
+        public XiEnterLeaveDetail detail;
+        public IntPtr RootWindow;
+        public IntPtr EventWindow;
+        public IntPtr ChildWindow;
+        public double root_x;
+        public double root_y;
+        public double event_x;
+        public double event_y;
+        public int mode;
+        public int focus;
+        public int same_screen;
+        public XIButtonState buttons;
+        public XIModifierState mods;
+        public XIModifierState group;
+    }
 
     [Flags]
     public enum XiDeviceEventFlags : int
@@ -286,5 +314,18 @@ namespace Avalonia.X11
         XI_BarrierLeave = 26,
         XI_LASTEVENT = XI_BarrierLeave,
     }
-    
+
+    enum XiEnterLeaveDetail
+    {
+        XINotifyAncestor = 0,
+        XINotifyVirtual = 1,
+        XINotifyInferior = 2,
+        XINotifyNonlinear = 3,
+        XINotifyNonlinearVirtual = 4,
+        XINotifyPointer = 5,
+        XINotifyPointerRoot = 6,
+        XINotifyDetailNone = 7
+
+    }
+
 }

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 uint *props; // List of property ids 
-            public ulong *prop_values; /**< List of property values */
+            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 
 
         }
         

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="localAssembly">Default assembly for clr-namespace:.</param>
-        /// <param name="rootInstance">
+        /// <param name="rootInstance">The optional instance into which the XAML should be loaded.</param>
-        /// The optional instance into which the XAML should be loaded.
+        /// <param name="uri">The URI of the XAML being loaded.</param>
-        /// </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);
             

src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs

@@ -5,5 +5,5 @@ using System.Runtime.CompilerServices;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.MarkupExtensions")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Styling")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Templates")]
-[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 

src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs

@@ -4,4 +4,4 @@ using System.Runtime.CompilerServices;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
-[assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Skia/Avalonia.Skia/DrawingContextImpl.cs

@@ -36,6 +36,7 @@ namespace Avalonia.Skia
         private readonly SKPaint _fillPaint = new SKPaint();
         private readonly SKPaint _boxShadowPaint = new SKPaint();
         private static SKShader s_acrylicNoiseShader;
+        private readonly ISkiaGpuRenderSession _session; 
 
         /// <summary>
         /// Context create info.
@@ -76,6 +77,8 @@ namespace Avalonia.Skia
             /// Skia GPU provider context (optional)
             /// </summary>
             public ISkiaGpu Gpu;
+
+            public ISkiaGpuRenderSession CurrentSession;
         }
 
         /// <summary>
@@ -96,6 +99,8 @@ namespace Avalonia.Skia
             Surface = createInfo.Surface;
             Canvas = createInfo.Canvas ?? createInfo.Surface?.Canvas;
 
+            _session = createInfo.CurrentSession;
+
             if (Canvas == null)
             {
                 throw new ArgumentException("Invalid create info - no Canvas provided", nameof(createInfo));
@@ -969,7 +974,8 @@ namespace Avalonia.Skia
                 Format = format,
                 DisableTextLcdRendering = !_canTextUseLcdRendering,
                 GrContext = _grContext,
-                Gpu = _gpu
+                Gpu = _gpu,
+                Session = _session
             };
 
             return new SurfaceRenderTarget(createInfo);

src/Skia/Avalonia.Skia/Gpu/ISkiaGpu.cs

@@ -21,7 +21,7 @@ namespace Avalonia.Skia
         /// Creates an offscreen render target surface
         /// </summary>
         /// <param name="size">size in pixels</param>
-        ISkiaSurface TryCreateSurface(PixelSize size);
+        ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session);
     }
     
     public interface ISkiaSurface : IDisposable

src/Skia/Avalonia.Skia/Gpu/ISkiaGpuRenderSession.cs

@@ -22,5 +22,7 @@ namespace Avalonia.Skia
         /// Scaling factor.
         /// </summary>
         double ScaleFactor { get; }
+        
+        GRSurfaceOrigin SurfaceOrigin { get; }
     }
 }

src/Skia/Avalonia.Skia/Gpu/OpenGl/FboSkiaSurface.cs

@@ -14,7 +14,7 @@ namespace Avalonia.Skia
         private int _texture;
 
         private static readonly bool[] TrueFalse = new[] { true, false };
-        public FboSkiaSurface(GRContext grContext, IGlContext glContext, PixelSize pixelSize)
+        public FboSkiaSurface(GRContext grContext, IGlContext glContext, PixelSize pixelSize, GRSurfaceOrigin surfaceOrigin)
         {
             _grContext = grContext;
             _glContext = glContext;
@@ -93,7 +93,7 @@ namespace Avalonia.Skia
             var target = new GRBackendRenderTarget(pixelSize.Width, pixelSize.Height, 0, 8,
                 new GRGlFramebufferInfo((uint)_fbo, SKColorType.Rgba8888.ToGlSizedFormat()));
             Surface = SKSurface.Create(_grContext, target,
-                GRSurfaceOrigin.BottomLeft, SKColorType.Rgba8888);
+                surfaceOrigin, SKColorType.Rgba8888);
             CanBlit = gl.BlitFramebuffer != null;
         }
         

src/Skia/Avalonia.Skia/Gpu/OpenGl/GlRenderTarget.cs

@@ -39,6 +39,8 @@ namespace Avalonia.Skia
                 _backendRenderTarget = backendRenderTarget;
                 _surface = surface;
                 _glSession = glSession;
+                
+                SurfaceOrigin = glSession.IsYFlipped ? GRSurfaceOrigin.TopLeft : GRSurfaceOrigin.BottomLeft;
             }
             public void Dispose()
             {
@@ -48,6 +50,8 @@ namespace Avalonia.Skia
                 GrContext.Flush();
                 _glSession.Dispose();
             }
+            
+            public GRSurfaceOrigin SurfaceOrigin { get; }
 
             public GRContext GrContext { get; }
             public SKSurface SkSurface => _surface;
@@ -73,10 +77,6 @@ namespace Avalonia.Skia
                         $"Can't create drawing context for surface with {size} size and {scaling} scaling");
                 }
 
-                gl.Viewport(0, 0, size.Width, size.Height);
-                gl.ClearStencil(0);
-                gl.ClearColor(0, 0, 0, 0);
-                gl.Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
                 lock (_grContext)
                 {
                     _grContext.ResetContext();
@@ -89,6 +89,7 @@ namespace Avalonia.Skia
                         SKColorType.Rgba8888);
 
                     success = true;
+
                     return new GlGpuSession(_grContext, renderTarget, surface, glSession);
                 }
             }

src/Skia/Avalonia.Skia/Gpu/OpenGl/GlSkiaGpu.cs

@@ -47,7 +47,7 @@ namespace Avalonia.Skia
             return null;
         }
 
-        public ISkiaSurface TryCreateSurface(PixelSize size)
+        public ISkiaSurface TryCreateSurface(PixelSize size, ISkiaGpuRenderSession session)
         {
             // Only windows platform needs our FBO trickery
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -62,7 +62,7 @@ namespace Avalonia.Skia
                 return null;
             try
             {
-                var surface = new FboSkiaSurface(_grContext, _glContext, size);
+                var surface = new FboSkiaSurface(_grContext, _glContext, size, session?.SurfaceOrigin ?? GRSurfaceOrigin.TopLeft);
                 _canCreateSurfaces = true;
                 return surface;
             }

src/Skia/Avalonia.Skia/Gpu/SkiaGpuRenderTarget.cs

@@ -33,7 +33,8 @@ namespace Avalonia.Skia
                 Dpi = SkiaPlatform.DefaultDpi * session.ScaleFactor,
                 VisualBrushRenderer = visualBrushRenderer,
                 DisableTextLcdRendering = true,
-                Gpu = _skiaGpu
+                Gpu = _skiaGpu,
+                CurrentSession =  session
             };
 
             return new DrawingContextImpl(nfo, session);

src/Skia/Avalonia.Skia/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Skia.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]

src/Skia/Avalonia.Skia/SurfaceRenderTarget.cs

@@ -51,7 +51,7 @@ namespace Avalonia.Skia
             _grContext = createInfo.GrContext;
             _gpu = createInfo.Gpu;
 
-            _surface = _gpu?.TryCreateSurface(PixelSize);
+            _surface = _gpu?.TryCreateSurface(PixelSize, createInfo.Session);
             if (_surface == null)
                 _surface = new SkiaSurfaceWrapper(CreateSurface(createInfo.GrContext, PixelSize.Width, PixelSize.Height,
                     createInfo.Format));
@@ -100,7 +100,7 @@ namespace Avalonia.Skia
                 VisualBrushRenderer = visualBrushRenderer,
                 DisableTextLcdRendering = _disableLcdRendering,
                 GrContext = _grContext,
-                Gpu = _gpu
+                Gpu = _gpu,
             };
 
             return new DrawingContextImpl(createInfo, Disposable.Create(() => Version++));
@@ -218,6 +218,8 @@ namespace Avalonia.Skia
             public GRContext GrContext;
 
             public ISkiaGpu Gpu;
+
+            public ISkiaGpuRenderSession Session;
         }
     }
 }

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

src/Windows/Avalonia.Direct2D1/Properties/AssemblyInfo.cs

@@ -6,6 +6,6 @@ using Avalonia.Direct2D1;
 [assembly: ExportRenderingSubsystem(OperatingSystemType.WinNT, 1, "Direct2D1", typeof(Direct2D1Platform), nameof(Direct2D1Platform.Initialize),
     typeof(Direct2DChecker))]
 
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.RenderTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
-[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests")]
+[assembly: InternalsVisibleTo("Avalonia.Direct2D1.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c1bba1142285fe0419326fb25866ba62c47e6c2b5c1ab0c95b46413fad375471232cb81706932e1cef38781b9ebd39d5100401bacb651c6c5bbf59e571e81b3bc08d2a622004e08b1a6ece82a7e0b9857525c86d2b95fab4bc3dce148558d7f3ae61aa3a234086902aeface87d9dfdd32b9d2fe3c6dd4055b5ab4b104998bd87")]
 

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>

src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

@@ -6,7 +6,8 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
-    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2019013001" />
+    <PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
+    <PackageReference Include="Microsoft.Windows.SDK.NET" Version="10.0.18362.3-preview" />
   </ItemGroup>
   <Import Project="$(MSBuildThisFileDirectory)\..\..\..\build\System.Drawing.Common.props" />    
 </Project>

src/Windows/Avalonia.Win32/Composition/CompositionBlurHost.cs

@@ -0,0 +1,18 @@
+namespace Avalonia.Win32
+{
+    internal class CompositionBlurHost : IBlurHost
+    {
+        Windows.UI.Composition.Visual _blurVisual;
+
+        public CompositionBlurHost(Windows.UI.Composition.Visual blurVisual)
+        {
+            _blurVisual = blurVisual;
+        }
+
+        public void SetBlur(bool enabled)
+        {
+            _blurVisual.IsVisible = enabled;
+        }
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/CompositionConnector.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Windows.UI.Composition;
+using Windows.UI.Composition.Interop;
+using WinRT;
+
+namespace Avalonia.Win32
+{
+    internal class CompositionConnector
+    {
+        private Compositor _compositor;
+        private Windows.System.DispatcherQueueController _dispatcherQueueController;
+        private CompositionGraphicsDevice _graphicsDevice;
+
+        internal enum DISPATCHERQUEUE_THREAD_APARTMENTTYPE
+        {
+            DQTAT_COM_NONE = 0,
+            DQTAT_COM_ASTA = 1,
+            DQTAT_COM_STA = 2
+        };
+
+        internal enum DISPATCHERQUEUE_THREAD_TYPE
+        {
+            DQTYPE_THREAD_DEDICATED = 1,
+            DQTYPE_THREAD_CURRENT = 2,
+        };
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct DispatcherQueueOptions
+        {
+            public int dwSize;
+
+            [MarshalAs(UnmanagedType.I4)]
+            public DISPATCHERQUEUE_THREAD_TYPE threadType;
+
+            [MarshalAs(UnmanagedType.I4)]
+            public DISPATCHERQUEUE_THREAD_APARTMENTTYPE apartmentType;
+        };
+
+        [DllImport("coremessaging.dll", EntryPoint = "CreateDispatcherQueueController", CharSet = CharSet.Unicode)]
+        internal static extern IntPtr CreateDispatcherQueueController(DispatcherQueueOptions options, out IntPtr dispatcherQueueController);
+
+        public CompositionConnector(EglPlatformOpenGlInterface egl)
+        {
+            EnsureDispatcherQueue();
+
+            if (_dispatcherQueueController != null)
+                _compositor = new Compositor();
+
+            var interop = _compositor.As<ICompositorInterop>();
+
+            var display = egl.Display as AngleWin32EglDisplay;
+
+            _graphicsDevice = interop.CreateGraphicsDevice(display.GetDirect3DDevice());
+        }
+
+        public ICompositionDrawingSurfaceInterop InitialiseWindowCompositionTree(IntPtr hwnd, out Windows.UI.Composition.Visual surfaceVisual, out IBlurHost blurHost)
+        {
+            var target = CreateDesktopWindowTarget(hwnd);
+
+            var surface = _graphicsDevice.CreateDrawingSurface(new Windows.Foundation.Size(0, 0),
+                Windows.Graphics.DirectX.DirectXPixelFormat.B8G8R8A8UIntNormalized,
+                Windows.Graphics.DirectX.DirectXAlphaMode.Premultiplied);
+
+            var surfaceInterop = surface.As<ICompositionDrawingSurfaceInterop>();
+
+            var brush = _compositor.CreateSurfaceBrush(surface);
+            var visual = _compositor.CreateSpriteVisual();
+
+            visual.Brush = brush;
+            visual.RelativeSizeAdjustment = new System.Numerics.Vector2(1, 1);
+
+            var container = _compositor.CreateContainerVisual();
+
+            target.Root = container;
+
+            var blur = CreateBlur();
+
+            blurHost = new CompositionBlurHost(blur);
+
+            container.Children.InsertAtTop(blur);
+
+            container.Children.InsertAtTop(visual);
+
+            visual.CompositeMode = CompositionCompositeMode.SourceOver;
+
+            surfaceVisual = container;
+
+            return surfaceInterop;
+        }
+
+        private SpriteVisual CreateBlur()
+        {
+            var blurEffect = new GaussianBlurEffect(new CompositionEffectSourceParameter("backdrop"));
+            var blurEffectFactory = _compositor.CreateEffectFactory(blurEffect);
+
+            var blurBrush = blurEffectFactory.CreateBrush();
+            var backDropBrush = _compositor.CreateBackdropBrush();
+
+            blurBrush.SetSourceParameter("backdrop", backDropBrush);
+
+            var saturateEffect = new SaturationEffect(blurEffect);
+            var satEffectFactory = _compositor.CreateEffectFactory(saturateEffect);
+
+            var satBrush = satEffectFactory.CreateBrush();
+            satBrush.SetSourceParameter("backdrop", backDropBrush);
+
+            var visual = _compositor.CreateSpriteVisual();
+            visual.IsVisible = false;
+
+            visual.RelativeSizeAdjustment = new System.Numerics.Vector2(1.0f, 1.0f);
+            visual.Brush = satBrush;
+
+            return visual;
+        }
+
+        private CompositionTarget CreateDesktopWindowTarget(IntPtr window)
+        {
+            var interop = _compositor.As<global::Windows.UI.Composition.Desktop.ICompositorDesktopInterop>();
+
+            interop.CreateDesktopWindowTarget(window, false, out var windowTarget);
+            return Windows.UI.Composition.Desktop.DesktopWindowTarget.FromAbi(windowTarget);
+        }
+
+        private void EnsureDispatcherQueue()
+        {
+            if (_dispatcherQueueController == null)
+            {
+                DispatcherQueueOptions options = new DispatcherQueueOptions();
+                options.apartmentType = DISPATCHERQUEUE_THREAD_APARTMENTTYPE.DQTAT_COM_NONE;
+                options.threadType = DISPATCHERQUEUE_THREAD_TYPE.DQTYPE_THREAD_CURRENT;
+                options.dwSize = Marshal.SizeOf(typeof(DispatcherQueueOptions));
+
+                CreateDispatcherQueueController(options, out var queue);
+                _dispatcherQueueController = Windows.System.DispatcherQueueController.FromAbi(queue);
+            }
+        }
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/CompositionEglGlPlatformSurface.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Runtime.InteropServices;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Angle;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+using Windows.UI.Composition.Interop;
+
+namespace Avalonia.Win32
+{
+    internal class CompositionEglGlPlatformSurface : EglGlPlatformSurfaceBase
+    {
+        private EglPlatformOpenGlInterface _egl;
+        private readonly IEglWindowGlPlatformSurfaceInfo _info;
+        private ICompositionDrawingSurfaceInterop _surfaceInterop;
+        private Windows.UI.Composition.Visual _surface;
+
+        public CompositionEglGlPlatformSurface(EglPlatformOpenGlInterface egl, IEglWindowGlPlatformSurfaceInfo info) : base()
+        {
+            _egl = egl;
+            _info = info;
+        }
+
+        public IBlurHost AttachToCompositionTree(CompositionConnector connector, IntPtr hwnd)
+        {
+            using (_egl.PrimaryContext.MakeCurrent())
+            {
+                _surfaceInterop = connector.InitialiseWindowCompositionTree(hwnd, out _surface, out var blurHost);
+                return blurHost;
+            }
+        }
+
+        public override IGlPlatformSurfaceRenderTarget CreateGlRenderTarget()
+        {
+            return new CompositionRenderTarget(_egl, _surface, _surfaceInterop, _info);
+        }
+
+        class CompositionRenderTarget : EglPlatformSurfaceRenderTargetBase
+        {
+            private readonly EglPlatformOpenGlInterface _egl;
+            private readonly IEglWindowGlPlatformSurfaceInfo _info;
+            private PixelSize _currentSize;
+            private readonly ICompositionDrawingSurfaceInterop _surfaceInterop;
+            private static Guid s_Iid = Guid.Parse("6f15aaf2-d208-4e89-9ab4-489535d34f9c");
+            private Windows.UI.Composition.Visual _compositionVisual;
+
+            public CompositionRenderTarget(EglPlatformOpenGlInterface egl,
+                Windows.UI.Composition.Visual compositionVisual,
+                ICompositionDrawingSurfaceInterop interopSurface,
+                IEglWindowGlPlatformSurfaceInfo info)
+                : base(egl)
+            {
+                _egl = egl;
+                _surfaceInterop = interopSurface;
+                _info = info;
+                _currentSize = info.Size;
+                _compositionVisual = compositionVisual;
+
+                using (_egl.PrimaryContext.MakeCurrent())
+                {
+                    _surfaceInterop.Resize(new POINT { X = _info.Size.Width, Y = _info.Size.Height });
+                }
+
+                _compositionVisual.Size = new System.Numerics.Vector2(_info.Size.Width, _info.Size.Height);
+            }
+
+            public override IGlPlatformSurfaceRenderingSession BeginDraw()
+            {
+                IntPtr texture;
+                EglSurface surface;
+
+                using (_egl.PrimaryEglContext.EnsureCurrent())
+                {
+                    if (_info.Size != _currentSize)
+                    {
+                        _surfaceInterop.Resize(new POINT { X = _info.Size.Width, Y = _info.Size.Height });
+                        _compositionVisual.Size = new System.Numerics.Vector2(_info.Size.Width, _info.Size.Height);
+                        _currentSize = _info.Size;
+                    }
+
+                    var offset = new POINT();
+
+                    _surfaceInterop.BeginDraw(
+                        IntPtr.Zero,
+                        ref s_Iid,
+                        out texture, ref offset);
+
+                    surface = (_egl.Display as AngleWin32EglDisplay).WrapDirect3D11Texture(_egl, texture, offset.X, offset.Y, _info.Size.Width, _info.Size.Height);
+                }
+
+                return base.BeginDraw(surface, _info, () => { _surfaceInterop.EndDraw(); Marshal.Release(texture); surface.Dispose(); }, true);
+            }
+        }
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/D2DEffects.cs

@@ -0,0 +1,91 @@
+using System;
+
+
+namespace Avalonia.Win32
+{
+    class D2DEffects
+    {
+        public static readonly Guid CLSID_D2D12DAffineTransform = new Guid(0x6AA97485, 0x6354, 0x4CFC, 0x90, 0x8C, 0xE4, 0xA7, 0x4F, 0x62, 0xC9, 0x6C);
+
+        public static readonly Guid CLSID_D2D13DPerspectiveTransform = new Guid(0xC2844D0B, 0x3D86, 0x46E7, 0x85, 0xBA, 0x52, 0x6C, 0x92, 0x40, 0xF3, 0xFB);
+
+        public static readonly Guid CLSID_D2D13DTransform = new Guid(0xE8467B04, 0xEC61, 0x4B8A, 0xB5, 0xDE, 0xD4, 0xD7, 0x3D, 0xEB, 0xEA, 0x5A);
+
+        public static readonly Guid CLSID_D2D1ArithmeticComposite = new Guid(0xFC151437, 0x049A, 0x4784, 0xA2, 0x4A, 0xF1, 0xC4, 0xDA, 0xF2, 0x09, 0x87);
+
+        public static readonly Guid CLSID_D2D1Atlas = new Guid(0x913E2BE4, 0xFDCF, 0x4FE2, 0xA5, 0xF0, 0x24, 0x54, 0xF1, 0x4F, 0xF4, 0x08);
+
+        public static readonly Guid CLSID_D2D1BitmapSource = new Guid(0x5FB6C24D, 0xC6DD, 0x4231, 0x94, 0x4, 0x50, 0xF4, 0xD5, 0xC3, 0x25, 0x2D);
+
+        public static readonly Guid CLSID_D2D1Blend = new Guid(0x81C5B77B, 0x13F8, 0x4CDD, 0xAD, 0x20, 0xC8, 0x90, 0x54, 0x7A, 0xC6, 0x5D);
+
+        public static readonly Guid CLSID_D2D1Border = new Guid(0x2A2D49C0, 0x4ACF, 0x43C7, 0x8C, 0x6A, 0x7C, 0x4A, 0x27, 0x87, 0x4D, 0x27);
+
+        public static readonly Guid CLSID_D2D1Brightness = new Guid(0x8CEA8D1E, 0x77B0, 0x4986, 0xB3, 0xB9, 0x2F, 0x0C, 0x0E, 0xAE, 0x78, 0x87);
+
+        public static readonly Guid CLSID_D2D1ColorManagement = new Guid(0x1A28524C, 0xFDD6, 0x4AA4, 0xAE, 0x8F, 0x83, 0x7E, 0xB8, 0x26, 0x7B, 0x37);
+
+        public static readonly Guid CLSID_D2D1ColorMatrix = new Guid(0x921F03D6, 0x641C, 0x47DF, 0x85, 0x2D, 0xB4, 0xBB, 0x61, 0x53, 0xAE, 0x11);
+
+        public static readonly Guid CLSID_D2D1Composite = new Guid(0x48FC9F51, 0xF6AC, 0x48F1, 0x8B, 0x58, 0x3B, 0x28, 0xAC, 0x46, 0xF7, 0x6D);
+
+        public static readonly Guid CLSID_D2D1ConvolveMatrix = new Guid(0x407F8C08, 0x5533, 0x4331, 0xA3, 0x41, 0x23, 0xCC, 0x38, 0x77, 0x84, 0x3E);
+
+        public static readonly Guid CLSID_D2D1Crop = new Guid(0xE23F7110, 0x0E9A, 0x4324, 0xAF, 0x47, 0x6A, 0x2C, 0x0C, 0x46, 0xF3, 0x5B);
+
+        public static readonly Guid CLSID_D2D1DirectionalBlur = new Guid(0x174319A6, 0x58E9, 0x49B2, 0xBB, 0x63, 0xCA, 0xF2, 0xC8, 0x11, 0xA3, 0xDB);
+
+        public static readonly Guid CLSID_D2D1DiscreteTransfer = new Guid(0x90866FCD, 0x488E, 0x454B, 0xAF, 0x06, 0xE5, 0x04, 0x1B, 0x66, 0xC3, 0x6C);
+
+        public static readonly Guid CLSID_D2D1DisplacementMap = new Guid(0xEDC48364, 0x417, 0x4111, 0x94, 0x50, 0x43, 0x84, 0x5F, 0xA9, 0xF8, 0x90);
+
+        public static readonly Guid CLSID_D2D1DistantDiffuse = new Guid(0x3E7EFD62, 0xA32D, 0x46D4, 0xA8, 0x3C, 0x52, 0x78, 0x88, 0x9A, 0xC9, 0x54);
+
+        public static readonly Guid CLSID_D2D1DistantSpecular = new Guid(0x428C1EE5, 0x77B8, 0x4450, 0x8A, 0xB5, 0x72, 0x21, 0x9C, 0x21, 0xAB, 0xDA);
+
+        public static readonly Guid CLSID_D2D1DpiCompensation = new Guid(0x6C26C5C7, 0x34E0, 0x46FC, 0x9C, 0xFD, 0xE5, 0x82, 0x37, 0x6, 0xE2, 0x28);
+
+        public static readonly Guid CLSID_D2D1Flood = new Guid(0x61C23C20, 0xAE69, 0x4D8E, 0x94, 0xCF, 0x50, 0x07, 0x8D, 0xF6, 0x38, 0xF2);
+
+        public static readonly Guid CLSID_D2D1GammaTransfer = new Guid(0x409444C4, 0xC419, 0x41A0, 0xB0, 0xC1, 0x8C, 0xD0, 0xC0, 0xA1, 0x8E, 0x42);
+
+        public static readonly Guid CLSID_D2D1GaussianBlur = new Guid(0x1FEB6D69, 0x2FE6, 0x4AC9, 0x8C, 0x58, 0x1D, 0x7F, 0x93, 0xE7, 0xA6, 0xA5);
+
+        public static readonly Guid CLSID_D2D1Scale = new Guid(0x9DAF9369, 0x3846, 0x4D0E, 0xA4, 0x4E, 0xC, 0x60, 0x79, 0x34, 0xA5, 0xD7);
+
+        public static readonly Guid CLSID_D2D1Histogram = new Guid(0x881DB7D0, 0xF7EE, 0x4D4D, 0xA6, 0xD2, 0x46, 0x97, 0xAC, 0xC6, 0x6E, 0xE8);
+
+        public static readonly Guid CLSID_D2D1HueRotation = new Guid(0x0F4458EC, 0x4B32, 0x491B, 0x9E, 0x85, 0xBD, 0x73, 0xF4, 0x4D, 0x3E, 0xB6);
+
+        public static readonly Guid CLSID_D2D1LinearTransfer = new Guid(0xAD47C8FD, 0x63EF, 0x4ACC, 0x9B, 0x51, 0x67, 0x97, 0x9C, 0x03, 0x6C, 0x06);
+
+        public static readonly Guid CLSID_D2D1LuminanceToAlpha = new Guid(0x41251AB7, 0x0BEB, 0x46F8, 0x9D, 0xA7, 0x59, 0xE9, 0x3F, 0xCC, 0xE5, 0xDE);
+
+        public static readonly Guid CLSID_D2D1Morphology = new Guid(0xEAE6C40D, 0x626A, 0x4C2D, 0xBF, 0xCB, 0x39, 0x10, 0x01, 0xAB, 0xE2, 0x02);
+
+        public static readonly Guid CLSID_D2D1OpacityMetadata = new Guid(0x6C53006A, 0x4450, 0x4199, 0xAA, 0x5B, 0xAD, 0x16, 0x56, 0xFE, 0xCE, 0x5E);
+
+        public static readonly Guid CLSID_D2D1PointDiffuse = new Guid(0xB9E303C3, 0xC08C, 0x4F91, 0x8B, 0x7B, 0x38, 0x65, 0x6B, 0xC4, 0x8C, 0x20);
+
+        public static readonly Guid CLSID_D2D1PointSpecular = new Guid(0x09C3CA26, 0x3AE2, 0x4F09, 0x9E, 0xBC, 0xED, 0x38, 0x65, 0xD5, 0x3F, 0x22);
+
+        public static readonly Guid CLSID_D2D1Premultiply = new Guid(0x06EAB419, 0xDEED, 0x4018, 0x80, 0xD2, 0x3E, 0x1D, 0x47, 0x1A, 0xDE, 0xB2);
+
+        public static readonly Guid CLSID_D2D1Saturation = new Guid(0x5CB2D9CF, 0x327D, 0x459F, 0xA0, 0xCE, 0x40, 0xC0, 0xB2, 0x08, 0x6B, 0xF7);
+
+        public static readonly Guid CLSID_D2D1Shadow = new Guid(0xC67EA361, 0x1863, 0x4E69, 0x89, 0xDB, 0x69, 0x5D, 0x3E, 0x9A, 0x5B, 0x6B);
+
+        public static readonly Guid CLSID_D2D1SpotDiffuse = new Guid(0x818A1105, 0x7932, 0x44F4, 0xAA, 0x86, 0x08, 0xAE, 0x7B, 0x2F, 0x2C, 0x93);
+
+        public static readonly Guid CLSID_D2D1SpotSpecular = new Guid(0xEDAE421E, 0x7654, 0x4A37, 0x9D, 0xB8, 0x71, 0xAC, 0xC1, 0xBE, 0xB3, 0xC1);
+
+        public static readonly Guid CLSID_D2D1TableTransfer = new Guid(0x5BF818C3, 0x5E43, 0x48CB, 0xB6, 0x31, 0x86, 0x83, 0x96, 0xD6, 0xA1, 0xD4);
+
+        public static readonly Guid CLSID_D2D1Tile = new Guid(0xB0784138, 0x3B76, 0x4BC5, 0xB1, 0x3B, 0x0F, 0xA2, 0xAD, 0x02, 0x65, 0x9F);
+
+        public static readonly Guid CLSID_D2D1Turbulence = new Guid(0xCF2BB6AE, 0x889A, 0x4AD7, 0xBA, 0x29, 0xA2, 0xFD, 0x73, 0x2C, 0x9F, 0xC9);
+
+        public static readonly Guid CLSID_D2D1UnPremultiply = new Guid(0xFB9AC489, 0xAD8D, 0x41ED, 0x99, 0x99, 0xBB, 0x63, 0x47, 0xD1, 0x10, 0xF7);
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/EffectBase.cs

@@ -0,0 +1,45 @@
+using System;
+using Windows.Graphics.Effects;
+using Windows.Graphics.Effects.Interop;
+
+
+namespace Avalonia.Win32
+{
+    abstract class EffectBase : IGraphicsEffect,  IGraphicsEffectSource, global::Windows.Graphics.Effects.Interop.IGraphicsEffectD2D1Interop
+    {
+        private IGraphicsEffectSource[] _sources;
+
+        public EffectBase(params IGraphicsEffectSource[] sources)
+        {
+            _sources = sources;
+        }
+
+        private IGraphicsEffectSource _source;
+
+        public virtual string Name { get; set; }
+
+        public abstract Guid EffectId { get; }
+
+        public abstract uint PropertyCount { get; }
+
+        public uint SourceCount => (uint)_sources.Length;
+
+        public IGraphicsEffectSource GetSource(uint index)
+        {
+            if(index < _sources.Length)
+            {
+                return _sources[index];
+            }
+
+            return null;
+        }
+
+        public uint GetNamedPropertyMapping(string name, out GRAPHICS_EFFECT_PROPERTY_MAPPING mapping)
+        {
+            throw new NotImplementedException();
+        }
+
+        public abstract object GetProperty(uint index);
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/GRAPHICS_EFFECT_PROPERTY_MAPPING.cs

@@ -0,0 +1,18 @@
+namespace Windows.Graphics.Effects.Interop
+{
+    public enum GRAPHICS_EFFECT_PROPERTY_MAPPING
+    {
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_UNKNOWN,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_DIRECT,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORX,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORY,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORZ,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_VECTORW,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_RECT_TO_VECTOR4,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_RADIANS_TO_DEGREES,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_COLORMATRIX_ALPHA_MODE,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_COLOR_TO_VECTOR3,
+        GRAPHICS_EFFECT_PROPERTY_MAPPING_COLOR_TO_VECTOR4
+    };
+}
+

src/Windows/Avalonia.Win32/Composition/GaussianBlurEffect.cs

@@ -0,0 +1,57 @@
+using System;
+using Windows.Graphics.Effects;
+
+namespace Avalonia.Win32
+{
+    class GaussianBlurEffect : EffectBase
+    {
+        public GaussianBlurEffect(IGraphicsEffectSource source) : base(source)
+        {
+        }
+
+        enum D2D1_GAUSSIANBLUR_OPTIMIZATION
+        {
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_SPEED,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_BALANCED,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_QUALITY,
+            D2D1_GAUSSIANBLUR_OPTIMIZATION_FORCE_DWORD
+        };
+
+        enum D2D1_BORDER_MODE
+        {
+            D2D1_BORDER_MODE_SOFT,
+            D2D1_BORDER_MODE_HARD,
+            D2D1_BORDER_MODE_FORCE_DWORD
+        };
+
+        enum D2D1GaussianBlurProp
+        {
+            D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION,
+            D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION,
+            D2D1_GAUSSIANBLUR_PROP_BORDER_MODE,
+            D2D1_GAUSSIANBLUR_PROP_FORCE_DWORD
+        };
+
+        public override Guid EffectId => D2DEffects.CLSID_D2D1GaussianBlur;
+
+        public override uint PropertyCount => 3;
+
+        public override object GetProperty(uint index)
+        {
+            switch ((D2D1GaussianBlurProp)index)
+            {
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION:
+                    return 30.0f;
+
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION:
+                    return (uint)D2D1_GAUSSIANBLUR_OPTIMIZATION.D2D1_GAUSSIANBLUR_OPTIMIZATION_BALANCED;
+
+                case D2D1GaussianBlurProp.D2D1_GAUSSIANBLUR_PROP_BORDER_MODE:
+                    return (uint)D2D1_BORDER_MODE.D2D1_BORDER_MODE_HARD;
+            }
+
+            return null;
+        }
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/IBlurHost.cs

@@ -0,0 +1,8 @@
+namespace Avalonia.Win32
+{
+    internal interface IBlurHost
+    {
+        void SetBlur(bool enabled);
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/ICompositionDrawingSurfaceInterop.cs

@@ -0,0 +1,152 @@
+using System;
+using System.Runtime.InteropServices;
+using WinRT;
+
+namespace Windows.UI.Composition.Interop
+{
+    public struct POINT
+    {
+        public int X;
+        public int Y;
+    }
+
+    public struct RECT
+    {
+        public int left;
+        public int top;
+        public int right;
+        public int bottom;
+
+        public int Width => right - left;
+        public int Height => bottom - top;
+    }
+
+    [WindowsRuntimeType]
+    [Guid("FD04E6E3-FE0C-4C3C-AB19-A07601A576EE")]
+    public interface ICompositionDrawingSurfaceInterop
+    {
+        void BeginDraw(IntPtr updateRect, ref Guid iid, out IntPtr updateObject, ref POINT point);
+
+        void EndDraw();
+
+        void Resize(POINT sizePixels);
+
+        void ResumeDraw();
+
+        void Scroll(RECT scrollRect, RECT clipRect, int offsetX, int offsetY);
+
+        void SuspendDraw();
+    }
+}
+
+namespace ABI.Windows.UI.Composition.Interop
+{
+    using global::System;
+    using global::System.Runtime.InteropServices;
+    using global::Windows.UI.Composition;
+    using global::Windows.UI.Composition.Interop;
+
+    [Guid("FD04E6E3-FE0C-4C3C-AB19-A07601A576EE")]
+    internal class ICompositionDrawingSurfaceInterop : global::Windows.UI.Composition.Interop.ICompositionDrawingSurfaceInterop
+
+    {
+        [Guid("FD04E6E3-FE0C-4C3C-AB19-A07601A576EE")]
+        public unsafe struct Vftbl
+        {
+            public delegate int _BeginDraw(IntPtr ThisPtr, IntPtr updateRect, ref Guid iid, out IntPtr updateObject, ref POINT updateOffset);
+            public delegate int _EndDraw(IntPtr ThisPtr);
+            public delegate int _Resize(IntPtr ThisPtr, POINT sizePixels);
+            public delegate int _ResumeDraw(IntPtr ThisPtr);
+            public delegate int _Scroll(IntPtr ThisPtr, RECT scrollRect, RECT clipRect, int offsetX, int offsetY);
+            public delegate int _SuspendDraw(IntPtr ThisPtr);
+
+            internal global::WinRT.Interop.IUnknownVftbl IUnknownVftbl;
+            public _BeginDraw BeginDraw;
+            public _EndDraw EndDraw;
+            public _Resize Resize;
+            public _ResumeDraw ResumeDraw;
+            public _Scroll Scroll;
+            public _SuspendDraw SuspendDraw;
+
+            public static readonly Vftbl AbiToProjectionVftable;
+            public static readonly IntPtr AbiToProjectionVftablePtr;
+
+            static Vftbl()
+            {
+                AbiToProjectionVftable = new Vftbl
+                {
+                    IUnknownVftbl = global::WinRT.Interop.IUnknownVftbl.AbiToProjectionVftbl,
+
+                    BeginDraw = Do_Abi_BeginDraw,
+                    EndDraw = Do_Abi_EndDraw,
+                    Resize = Do_Abi_Resize
+
+
+                };
+                AbiToProjectionVftablePtr = Marshal.AllocHGlobal(Marshal.SizeOf<Vftbl>());
+                Marshal.StructureToPtr(AbiToProjectionVftable, AbiToProjectionVftablePtr, false);
+            }
+
+            private static int Do_Abi_BeginDraw(IntPtr ThisPtr, IntPtr updateRect, ref Guid iid, out IntPtr updateObject, ref POINT updateOffset)
+            {
+                updateObject = IntPtr.Zero;
+                return 0;
+            }
+
+            private static int Do_Abi_EndDraw(IntPtr ThisPtr)
+            {
+                return 0;
+            }
+
+            private static int Do_Abi_Resize(IntPtr ThisPtr, POINT sizePixels)
+            {
+                return 0;
+            }
+        }
+        internal static ObjectReference<Vftbl> FromAbi(IntPtr thisPtr) => ObjectReference<Vftbl>.FromAbi(thisPtr);
+
+        public static implicit operator ICompositionDrawingSurfaceInterop(IObjectReference obj) => (obj != null) ? new ICompositionDrawingSurfaceInterop(obj) : null;
+        protected readonly ObjectReference<Vftbl> _obj;
+        public IObjectReference ObjRef { get => _obj; }
+        public IntPtr ThisPtr => _obj.ThisPtr;
+        public ObjectReference<I> AsInterface<I>() => _obj.As<I>();
+        public A As<A>() => _obj.AsType<A>();
+
+        public ICompositionDrawingSurfaceInterop(IObjectReference obj) : this(obj.As<Vftbl>()) { }
+        internal ICompositionDrawingSurfaceInterop(ObjectReference<Vftbl> obj)
+        {
+            _obj = obj;
+        }
+
+        public void BeginDraw(IntPtr updateRect, ref Guid iid, out IntPtr updateObject, ref POINT point)
+        {
+            Marshal.ThrowExceptionForHR(_obj.Vftbl.BeginDraw(ThisPtr, updateRect, ref iid, out updateObject, ref point));
+        }
+
+        public void EndDraw()
+        {
+            Marshal.ThrowExceptionForHR(_obj.Vftbl.EndDraw(ThisPtr));
+        }
+
+        public void Resize(POINT sizePixels)
+        {
+            Marshal.ThrowExceptionForHR(_obj.Vftbl.Resize(ThisPtr, sizePixels));
+        }
+
+        public void ResumeDraw()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Scroll(RECT scrollRect, RECT clipRect, int offsetX, int offsetY)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SuspendDraw()
+        {
+            throw new NotImplementedException();
+        }        
+    }
+}
+

src/Windows/Avalonia.Win32/Composition/ICompositorDesktopInterop.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Runtime.InteropServices;
+using WinRT;
+
+namespace Windows.UI.Composition.Desktop
+{
+    [WindowsRuntimeType]
+    [Guid("29E691FA-4567-4DCA-B319-D0F207EB6807")]
+    public interface ICompositorDesktopInterop
+    {
+        void CreateDesktopWindowTarget(IntPtr hwndTarget, bool isTopmost, out IntPtr test);
+    }
+}
+