Merge branch 'master' into feature/ApplicationOnStartup

8 years ago · 5e52d4860b
208 changed files with 4986 additions and 228 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -4,3 +4,6 @@
 [submodule "nukebuild/Numerge"]
 	path = nukebuild/Numerge
 	url = https://github.com/kekekeks/Numerge.git
 [submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
 	path = src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github
 	url = https://github.com/kekekeks/XamlIl.git
--- a/.ncrunch/Avalonia.Animation.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Animation.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Animation.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Animation.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Animation.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Animation.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Base.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Base.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Base.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Base.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Base.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Base.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Benchmarks.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Benchmarks.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Build.Tasks.v3.ncrunchproject
@ -0,0 +1,5 @@
 <ProjectConfiguration>
  <Settings>
    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Controls.DataGrid.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Controls.DataGrid.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Controls.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Controls.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Controls.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Controls.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Controls.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Designer.HostApp.net461.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Designer.HostApp.net461.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Designer.HostApp.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Designer.HostApp.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.DesignerSupport.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.DesktopRuntime.net461.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.DesktopRuntime.net461.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.DesktopRuntime.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.DesktopRuntime.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Diagnostics.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Diagnostics.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Direct2D1.RenderTests.v3.ncrunchproject
@ -4,6 +4,9 @@
      <Value>..\TestFiles\Direct2D1\**.*</Value>
    </AdditionalFilesToIncludeForProject>
    <DefaultTestTimeout>3000</DefaultTestTimeout>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Direct2D1.UnitTests.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Direct2D1.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Direct2D1.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Gtk3.v3.ncrunchproject
@ -1,3 +1,7 @@
 <ProjectConfiguration>
-  <Settings />
+  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Input.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Input.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Input.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Input.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Input.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Input.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Interactivity.UnitTests.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Interactivity.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Interactivity.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Layout.UnitTests.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Layout.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Layout.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.LeakTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.LeakTests.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.LinuxFramebuffer.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.LinuxFramebuffer.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Logging.Serilog.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.Xaml.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.Xaml.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.Xaml.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.Xaml.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.Xaml.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Markup.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Markup.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.OpenGL.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.OpenGL.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.ReactiveUI.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.ReactiveUI.UnitTests.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.ReactiveUI.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Skia.RenderTests.v3.ncrunchproject
@ -4,6 +4,9 @@
      <Value>..\TestFiles\Skia\**.*</Value>
    </AdditionalFilesToIncludeForProject>
    <DefaultTestTimeout>3000</DefaultTestTimeout>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Skia.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Skia.UnitTests.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Skia.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Skia.v3.ncrunchproject
@ -1,3 +1,7 @@
 <ProjectConfiguration>
-  <Settings />
+  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Styling.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Styling.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Styling.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Styling.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Styling.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Styling.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Themes.Default.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Themes.Default.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.UnitTests.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.UnitTests.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Visuals.UnitTests.net47.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Visuals.UnitTests.net47.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Visuals.UnitTests.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Visuals.UnitTests.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Visuals.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Visuals.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Win32.Interop.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Win32.Interop.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.Win32.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.Win32.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.X11.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.X11.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.netcoreapp2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.netcoreapp2.0.v3.ncrunchproject
@ -0,0 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>DerivedFilesIncludedInWorkspace</Value>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Avalonia.netstandard2.0.v3.ncrunchproject
+++ b/.ncrunch/Avalonia.netstandard2.0.v3.ncrunchproject
@ -0,0 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>DerivedFilesIncludedInWorkspace</Value>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/Direct3DInteropSample.v3.ncrunchproject
+++ b/.ncrunch/Direct3DInteropSample.v3.ncrunchproject
@ -1,5 +1,8 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
    <PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
  </Settings>
 </ProjectConfiguration>
--- a/.ncrunch/PlatformSanityChecks.v3.ncrunchproject
+++ b/.ncrunch/PlatformSanityChecks.v3.ncrunchproject
@ -0,0 +1,7 @@
 <ProjectConfiguration>
  <Settings>
    <HiddenComponentWarnings>
      <Value>MissingOrIgnoredProjectReference</Value>
    </HiddenComponentWarnings>
  </Settings>
 </ProjectConfiguration>
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@ -4,8 +4,8 @@
     <Compile Update="**\*.xaml.cs">
      <DependentUpon>%(Filename)</DependentUpon>
    </Compile>
-    <EmbeddedResource Include="**\*.xaml">
+    <AvaloniaResource Include="**\*.xaml">
      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </AvaloniaResource>
  </ItemGroup>
 </Project>
--- a/build/SampleApp.props
+++ b/build/SampleApp.props
@ -5,4 +5,9 @@
  <ItemGroup>
    <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Avalonia.Desktop\Avalonia.Desktop.csproj" />
  </ItemGroup>
  <Target Name="GatherReferences" AfterTargets="CoreCompile">
    <WriteLinesToFile File="$(TargetPath).refs"
                      Lines="@(ReferencePathWithRefAssemblies)"
                      Overwrite="true" />
  </Target>
 </Project>
--- a/dirs.proj
+++ b/dirs.proj
@ -6,12 +6,12 @@
    <ProjectReference Include="packages/**/*.*proj" />
    <ProjectReference Remove="**/*.shproj" />
    <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/PortableXaml/**/*.*proj" />
    <ProjectReference Remove="src/Markup/Avalonia.Markup.Xaml/XamlIl/**/*.*proj" />
  </ItemGroup>
-  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\Android')">
+<!-- Disabled on CI because of ancient MSBuild project format -->
  <ItemGroup>
    <ProjectReference Remove="src/Android/**/*.*proj" />
    <ProjectReference Remove="samples/ControlCatalog.Android/ControlCatalog.Android.csproj" />
  </ItemGroup>
  <ItemGroup Condition="!Exists('$(MSBuildExtensionsPath)\Xamarin\iOS')">
    <ProjectReference Remove="src/iOS/**/*.*proj" />
    <ProjectReference Remove="samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj" />
  </ItemGroup>
--- a/nukebuild/Numerge
+++ b/nukebuild/Numerge
@ -1 +1 @@
-Subproject commit aef10ae67dc55c95f49b52a505a0be33bfa297a5
+Subproject commit 4464343aef5c8ab7a42fcb20a483a6058199f8b8
--- a/packages/Avalonia/AvaloniaBuildTasks.targets
+++ b/packages/Avalonia/AvaloniaBuildTasks.targets
@ -8,6 +8,10 @@
             AssemblyFile="$(AvaloniaBuildTasksLocation)"
             />
  <UsingTask TaskName="CompileAvaloniaXamlTask"
             AssemblyFile="$(AvaloniaBuildTasksLocation)"
             />
  <Target Name="AddAvaloniaResources" BeforeTargets="ResolveReferences">
    <PropertyGroup>
@ -20,11 +24,15 @@
    </ItemGroup>
  </Target>
  <PropertyGroup>
    <BuildAvaloniaResourcesDependsOn>$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences</BuildAvaloniaResourcesDependsOn>
  </PropertyGroup>
  <Target Name="GenerateAvaloniaResources" 
          BeforeTargets="CoreCompile;CoreResGen"
          Inputs="@(AvaloniaResource);$(MSBuildAllProjects)"
          Outputs="$(AvaloniaResourcesTemporaryFilePath)"
-          DependsOnTargets="$(BuildAvaloniaResourcesDependsOn);AddAvaloniaResources;ResolveReferences">
+          DependsOnTargets="$(BuildAvaloniaResourcesDependsOn)">
    <GenerateAvaloniaResourcesTask
      Condition="'$(_AvaloniaUseExternalMSBuild)' != 'true'"
      Output="$(AvaloniaResourcesTemporaryFilePath)"
@ -33,9 +41,36 @@
      EmbeddedResources="@(EmbeddedResources)"/>
    <Exec 
      Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
-      Command="dotnet msbuild /nodereuse:false $(MSBuildProjectFile) /t:GenerateAvaloniaResources /p:_AvaloniaForceInternalMSBuild=true /p:Configuration=$(Configuration)"/>
+      Command="dotnet msbuild /nodereuse:false $(MSBuildProjectFile) /t:GenerateAvaloniaResources /p:_AvaloniaForceInternalMSBuild=true /p:Configuration=$(Configuration) /p:TargetFramework=$(TargetFramework) /p:BuildProjectReferences=false"/>
  </Target>
  <Target
    Name="CompileAvaloniaXaml"
    AfterTargets="AfterCompile"
    Condition="Exists('@(IntermediateAssembly)') And $(DesignTimeBuild) != true And $(EnableAvaloniaXamlCompilation) != false"
    >
    <PropertyGroup>
      <AvaloniaXamlReferencesTemporaryFilePath Condition="'$(AvaloniaXamlReferencesTemporaryFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/references</AvaloniaXamlReferencesTemporaryFilePath>
      <AvaloniaXamlOriginalCopyFilePath Condition="'$(AvaloniaXamlOriginalCopyFilePath)' == ''">$(IntermediateOutputPath)/Avalonia/original.dll</AvaloniaXamlOriginalCopyFilePath>
    </PropertyGroup>
    <WriteLinesToFile
      Condition="'$(_AvaloniaForceInternalMSBuild)' != 'true'"
      File="$(AvaloniaXamlReferencesTemporaryFilePath)"
      Lines="@(ReferencePathWithRefAssemblies)"
      Overwrite="true" />
    <CompileAvaloniaXamlTask
      Condition="'$(_AvaloniaUseExternalMSBuild)' != 'true'"
      AssemblyFile="@(IntermediateAssembly)"
      ReferencesFilePath="$(AvaloniaXamlReferencesTemporaryFilePath)"
      OriginalCopyPath="$(AvaloniaXamlOriginalCopyFilePath)"
      ProjectDirectory="$(MSBuildProjectDirectory)"
    />
    <Exec
      Condition="'$(_AvaloniaUseExternalMSBuild)' == 'true'"
      Command="dotnet msbuild /nodereuse:false $(MSBuildProjectFile) /t:CompileAvaloniaXaml /p:_AvaloniaForceInternalMSBuild=true /p:Configuration=$(Configuration) /p:TargetFramework=$(TargetFramework) /p:BuildProjectReferences=false"/>
  </Target>
  <ItemGroup>
    <UpToDateCheckInput Include="@(AvaloniaResource)" />
--- a/samples/BindingDemo/App.xaml
+++ b/samples/BindingDemo/App.xaml
@ -1,6 +1,9 @@
-<Application xmlns="https://github.com/avaloniaui">
+<Application
-  <Application.Styles>
+    xmlns="https://github.com/avaloniaui" 
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    x:Class="BindingDemo.App">
-  </Application.Styles>
+    <Application.Styles>
        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
    </Application.Styles>
 </Application>
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@ -14,4 +14,5 @@
  <Import Project="..\..\build\ReactiveUI.props" />
  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/BindingDemo/MainWindow.xaml
+++ b/samples/BindingDemo/MainWindow.xaml
@ -1,6 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-        xmlns:vm="clr-namespace:BindingDemo.ViewModels"
+        x:Class="BindingDemo.MainWindow"
        xmlns:vm="clr-namespace:BindingDemo.ViewModels" 
        xmlns:local="clr-namespace:BindingDemo"
        Title="AvaloniaUI Bindings Test"
        Width="800"
--- a/samples/BindingDemo/TestItemView.xaml
+++ b/samples/BindingDemo/TestItemView.xaml
@ -1,4 +1,6 @@
-<UserControl xmlns="https://github.com/avaloniaui">
+<UserControl xmlns="https://github.com/avaloniaui"
        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
        x:Class="BindingDemo.TestItemView">
  <StackPanel>
    <TextBlock Classes="h1" Text="{Binding StringValue}"/>
    <TextBox Text="{Binding Detail}" AcceptsReturn="True"/>
--- a/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
+++ b/samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj
@ -3,6 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.0</TargetFramework>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>
  <ItemGroup>
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@ -4,7 +4,7 @@
  <Application.Styles>
      <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
      <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
-      <StyleInclude Source="resm:Avalonia.Controls.DataGrid.Themes.Default.xaml?assembly=Avalonia.Controls.DataGrid"/>
+      <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
    <Style Selector="TextBlock.h1">
      <Setter Property="FontSize" Value="{DynamicResource FontSizeLarge}"/>
      <Setter Property="FontWeight" Value="Medium"/>
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@ -29,6 +29,7 @@
      <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
      <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
      <TabItem Header="Menu"><pages:MenuPage/></TabItem>
      <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
      <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
      <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@ -1,8 +1,11 @@
 using System;
 using System.Collections;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Markup.Xaml.XamlIl;
 using Avalonia.Platform;
 using ControlCatalog.Pages;
@ -12,7 +15,7 @@ namespace ControlCatalog
    {
        public MainView()
        {
-            this.InitializeComponent();
+            AvaloniaXamlLoader.Load(this);
            if (AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().IsDesktop)
            {
                IList tabItems = ((IList)this.FindControl<TabControl>("Sidebar").Items);
@ -28,8 +31,17 @@ namespace ControlCatalog
                });
            }
-            var light = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default'/>");
+
-            var dark = AvaloniaXamlLoader.Parse<StyleInclude>(@"<StyleInclude xmlns='https://github.com/avaloniaui' Source='resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default'/>");
+            var light = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
            {
                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default")
            };
            var dark = new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
            {
                Source = new Uri("resm:Avalonia.Themes.Default.Accents.BaseDark.xaml?assembly=Avalonia.Themes.Default")
            };
            var themes = this.Find<ComboBox>("Themes");
            themes.SelectionChanged += (sender, e) =>
            {
@ -45,10 +57,5 @@ namespace ControlCatalog
            };
            Styles.Add(light);
        }
        private void InitializeComponent()
        {
            AvaloniaXamlLoader.Load(this);
        }
    }
 }
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@ -1,8 +1,18 @@
 <Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
        xmlns:pages="clr-namespace:ControlCatalog.Pages"
        Title="Avalonia Control Gallery"
        Icon="/Assets/test_icon.ico"
        xmlns:local="clr-namespace:ControlCatalog"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:vm="clr-namespace:ControlCatalog.ViewModels"
        xmlns:v="clr-namespace:ControlCatalog.Views"
        x:Class="ControlCatalog.MainWindow">
-    <local:MainView/>
+    <Window.DataTemplates>
        <DataTemplate DataType="vm:NotificationViewModel">
            <v:CustomNotificationView />
        </DataTemplate>
    </Window.DataTemplates>
    <Panel>
        <local:MainView/>
    </Panel>
 </Window>
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@ -1,18 +1,33 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Controls.Primitives;
 using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using ControlCatalog.ViewModels;
 using System;
 using System.Threading.Tasks;
 namespace ControlCatalog
 {
    public class MainWindow : Window
    {
        private WindowNotificationManager _notificationArea;
        public MainWindow()
        {
            this.InitializeComponent();
            this.AttachDevTools();
            //Renderer.DrawFps = true;
            //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
            _notificationArea = new WindowNotificationManager(this)
            {
                Position = NotificationPosition.TopRight,
                MaxItems = 3
            };
            DataContext = new MainWindowViewModel(_notificationArea);
        }
        private void InitializeComponent()
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
@ -5,14 +5,5 @@ namespace ControlCatalog.Pages
 {
    public class ButtonPage : UserControl
    {
        public ButtonPage()
        {
            this.InitializeComponent();
        }
        private void InitializeComponent()
        {
            AvaloniaXamlLoader.Load(this);
        }
    }
 }
--- a/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonSpinnerPage.xaml.cs
@ -18,7 +18,7 @@ namespace ControlCatalog.Pages
            AvaloniaXamlLoader.Load(this);
        }
-        private void OnSpin(object sender, SpinEventArgs e)
+        public void OnSpin(object sender, SpinEventArgs e)
        {
            var spinner = (ButtonSpinner)sender;
            var txtBox = (TextBlock)spinner.Content;
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@ -0,0 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             x:Class="ControlCatalog.Pages.NotificationsPage">
  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
        <TextBlock Classes="h1">Notifications</TextBlock>
        <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
        <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
        <Button Content="Show Native Notification" Command="{Binding ShowNativeNotificationCommand}" />
    </StackPanel>
 </UserControl>
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
@ -0,0 +1,18 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 namespace ControlCatalog.Pages
 {
    public class NotificationsPage : UserControl
    {
        public NotificationsPage()
        {
            this.InitializeComponent();
        }
        private void InitializeComponent()
        {
            AvaloniaXamlLoader.Load(this);
        }
    }
 }
--- a/samples/ControlCatalog/SideBar.xaml
+++ b/samples/ControlCatalog/SideBar.xaml
@ -1,6 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="ControlCatalog.SideBar">
+>
    <Design.PreviewWith>
        <Border Padding="20">
            <TabControl Classes="sidebar">
@ -56,7 +56,7 @@
        <Setter Property="Opacity" Value="0.5"/>
        <Setter Property="Transitions">
            <Transitions>
-                <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
+                <DoubleTransition Property="Opacity" Duration="0:0:0.150"/>
            </Transitions>
        </Setter>
    </Style>
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@ -0,0 +1,44 @@
 using System.Reactive;
 using Avalonia.Controls.Notifications;
 using Avalonia.Diagnostics.ViewModels;
 using ReactiveUI;
 namespace ControlCatalog.ViewModels
 {
    class MainWindowViewModel : ViewModelBase
    {
        private IManagedNotificationManager _notificationManager;
        public MainWindowViewModel(IManagedNotificationManager notificationManager)
        {
            _notificationManager = notificationManager;
            ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
            {
                NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
            });
            ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
            {
                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
            });
            ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
            {
                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
            });
        }
        public IManagedNotificationManager NotificationManager
        {
            get { return _notificationManager; }
            set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
        }
        public ReactiveCommand<Unit, Unit> ShowCustomManagedNotificationCommand { get; }
        public ReactiveCommand<Unit, Unit> ShowManagedNotificationCommand { get; }
        public ReactiveCommand<Unit, Unit> ShowNativeNotificationCommand { get; }
    }
 }
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@ -0,0 +1,30 @@
 using System.Reactive;
 using Avalonia.Controls.Notifications;
 using ReactiveUI;
 namespace ControlCatalog.ViewModels
 {
    public class NotificationViewModel
    {
        public NotificationViewModel(INotificationManager manager)
        {
            YesCommand = ReactiveCommand.Create(() =>
            {
                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
            });
            NoCommand = ReactiveCommand.Create(() =>
            {
                manager.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today. To find out more visit..."));
            });
        }
        public string Title { get; set; }
        public string Message { get; set; }
        public ReactiveCommand<Unit, Unit> YesCommand { get; }
        public ReactiveCommand<Unit, Unit> NoCommand { get; }
    }
 }
--- a/samples/ControlCatalog/Views/CustomNotificationView.xaml
+++ b/samples/ControlCatalog/Views/CustomNotificationView.xaml
@ -0,0 +1,19 @@
 <UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             x:Class="ControlCatalog.Views.CustomNotificationView">
    <Border Padding="12" MinHeight="20" Background="DodgerBlue">
        <Grid ColumnDefinitions="Auto,*">
            <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
                <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>
            </Panel>
            <DockPanel Grid.Column="1">
                <TextBlock DockPanel.Dock="Top" Text="{Binding Title}" FontWeight="Medium" />
                <StackPanel Spacing="20" DockPanel.Dock="Bottom" Margin="0,8,0,0" Orientation="Horizontal">
                    <Button Content="No" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding NoCommand}"  Margin="0,0,8,0" />
                    <Button Content="Yes" DockPanel.Dock="Right" NotificationCard.CloseOnClick="True" Command="{Binding YesCommand}" />
                </StackPanel>
                <TextBlock Text="{Binding Message}" TextWrapping="Wrap" Opacity=".8" Margin="0,8,0,0"/>
            </DockPanel>
        </Grid>
    </Border>
 </UserControl>
--- a/samples/ControlCatalog/Views/CustomNotificationView.xaml.cs
+++ b/samples/ControlCatalog/Views/CustomNotificationView.xaml.cs
@ -0,0 +1,18 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 namespace ControlCatalog.Views
 {
    public class CustomNotificationView : UserControl
    {
        public CustomNotificationView()
        {
            this.InitializeComponent();
        }
        private void InitializeComponent()
        {
            AvaloniaXamlLoader.Load(this);
        }
    }
 }
--- a/samples/RemoteDemo/RemoteDemo.csproj
+++ b/samples/RemoteDemo/RemoteDemo.csproj
@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
  </ItemGroup>
  <Import Project="..\..\build\SampleApp.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
-
+  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@ -1,7 +1,10 @@
-<Application xmlns="https://github.com/avaloniaui">
+<Application
-  <Application.Styles>
+    xmlns="https://github.com/avaloniaui" 
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    x:Class="RenderDemo.App">
-    <StyleInclude Source="resm:RenderDemo.SideBar.xaml"/>
+    <Application.Styles>
-  </Application.Styles>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
        <StyleInclude Source="avares://RenderDemo/SideBar.xaml"/>
    </Application.Styles>
 </Application>
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@ -1,4 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        x:Class="RenderDemo.MainWindow"
        Title="AvaloniaUI Rendering Test"
        xmlns:pages="clr-namespace:RenderDemo.Pages"
        Width="800"
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@ -1,6 +1,7 @@
-<UserControl
+<UserControl 
-xmlns="https://github.com/avaloniaui"
+  xmlns="https://github.com/avaloniaui" 
-xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
  x:Class="RenderDemo.Pages.AnimationsPage">
  <UserControl.Styles>
    <Styles>
      <Styles.Resources>
--- a/samples/RenderDemo/Pages/ClippingPage.xaml
+++ b/samples/RenderDemo/Pages/ClippingPage.xaml
@ -1,9 +1,11 @@
-<UserControl
+<UserControl 
-xmlns="https://github.com/avaloniaui">
+  xmlns="https://github.com/avaloniaui" 
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
  x:Class="RenderDemo.Pages.ClippingPage">
  <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto">
    <Grid.Styles>
      <Styles>
-        <Style Selector="Border#clipped :pointerover">
+        <Style Selector="Border#clipped:pointerover">
          <Setter Property="Border.Background" Value="Crimson"/>
        </Style>
        <Style Selector="Border#clipChild">
@ -17,10 +19,10 @@ xmlns="https://github.com/avaloniaui">
        </Style>
      </Styles>
    </Grid.Styles>
-    <Border Name="clipped"
+    <Border Name="clipped" 
-            Background="Yellow"
+            Background="Yellow" 
-            Width="100"
+            Width="100" 
-            Height="100"
+            Height="100" 
            Clip="M 58.625 0.07421875
                  C 50.305778 0.26687364 42.411858 7.0346526 41.806641 15.595703
                  C 42.446442 22.063923 39.707425 13.710754 36.982422 12.683594
--- a/samples/RenderDemo/Pages/DrawingPage.xaml
+++ b/samples/RenderDemo/Pages/DrawingPage.xaml
@ -1,5 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl 
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns="https://github.com/avaloniaui" 
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    x:Class="RenderDemo.Pages.DrawingPage">
    <UserControl.Styles>
        <Style>
            <Style.Resources>
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@ -14,4 +14,5 @@
  <Import Project="..\..\build\ReactiveUI.props" />
  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/samples/RenderDemo/SideBar.xaml
+++ b/samples/RenderDemo/SideBar.xaml
@ -47,7 +47,7 @@
        <Setter Property="Opacity" Value="0.5"/>
        <Setter Property="Transitions">
            <Transitions>
-                <DoubleTransition Property="Opacity" Duration="0:0:0.5"/>
+                <DoubleTransition Property="Opacity" Duration="0:0:0.150"/>
            </Transitions>
        </Setter>
    </Style>
--- a/samples/VirtualizationDemo/App.xaml
+++ b/samples/VirtualizationDemo/App.xaml
@ -1,6 +1,9 @@
-<Application xmlns="https://github.com/avaloniaui">
+<Application
-  <Application.Styles>
+    xmlns="https://github.com/avaloniaui" 
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    x:Class="VirtualizationDemo.App">
-  </Application.Styles>
+    <Application.Styles>
        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
    </Application.Styles>
 </Application>
--- a/samples/VirtualizationDemo/MainWindow.xaml
+++ b/samples/VirtualizationDemo/MainWindow.xaml
@ -1,4 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        x:Class="VirtualizationDemo.MainWindow"
        Title="AvaloniaUI Virtualization Test"
        Width="800"
        Height="600">
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@ -14,4 +14,5 @@
  <Import Project="..\..\build\ReactiveUI.props" />
  <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
  <Import Project="..\..\build\ReferenceCoreLibraries.props" />
  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@ -7,7 +7,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Collections;
 using Avalonia.Data;
-using Avalonia.Animation.Animators; 
+using Avalonia.Animation.Animators;
 namespace Avalonia.Animation
 {
@ -36,13 +36,27 @@ namespace Avalonia.Animation
        private Transitions _transitions;
        private Dictionary<AvaloniaProperty, IDisposable> _previousTransitions;
        /// <summary>
        /// Gets or sets the property transitions for the control.
        /// </summary>
        public Transitions Transitions
        {
-            get { return _transitions ?? (_transitions = new Transitions()); }
+            get
-            set { SetAndRaise(TransitionsProperty, ref _transitions, value); }
+            {
                if (_transitions == null)
                    _transitions = new Transitions();
                if (_previousTransitions == null)
                    _previousTransitions = new Dictionary<AvaloniaProperty, IDisposable>();
                return _transitions;
            }
            set
            {
                SetAndRaise(TransitionsProperty, ref _transitions, value);
            }
        }
        /// <summary>
@ -52,13 +66,18 @@ namespace Avalonia.Animation
        /// <param name="e">The event args.</param>
        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
        {
-            if (e.Priority != BindingPriority.Animation && Transitions != null)
+            if (e.Priority != BindingPriority.Animation && Transitions != null && _previousTransitions != null)
            {
                var match = Transitions.FirstOrDefault(x => x.Property == e.Property);
                if (match != null)
                {
-                    match.Apply(this, Clock ?? Avalonia.Animation.Clock.GlobalClock, e.OldValue, e.NewValue);
+                    if (_previousTransitions.TryGetValue(e.Property, out var dispose))
                        dispose.Dispose();
                    var instance = match.Apply(this, Clock ?? Avalonia.Animation.Clock.GlobalClock, e.OldValue, e.NewValue);
                    _previousTransitions[e.Property] = instance;
                }
            }
        }
--- a/src/Avalonia.Animation/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Animation/Properties/AssemblyInfo.cs
@ -3,7 +3,10 @@
 using Avalonia.Metadata;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Easings")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Animation.Animators")]
 [assembly: InternalsVisibleTo("Avalonia.LeakTests")]
--- a/src/Avalonia.Animation/TransitionInstance.cs
+++ b/src/Avalonia.Animation/TransitionInstance.cs
@ -30,13 +30,16 @@ namespace Avalonia.Animation
        {
            var interpVal = (double)t.Ticks / _duration.Ticks;
-            if (interpVal > 1d || interpVal < 0d)
+            // Clamp interpolation value.
            if (interpVal >= 1d | interpVal < 0d)
            {
                PublishNext(1d);
                PublishCompleted();
                return;
            }
-
+            else
-            PublishNext(interpVal);
+            {
                PublishNext(interpVal);
            }
        }
        protected override void Unsubscribed()
--- a/src/Avalonia.Base/AvaloniaProperty.cs
+++ b/src/Avalonia.Base/AvaloniaProperty.cs
@ -19,7 +19,7 @@ namespace Avalonia
        /// <summary>
        /// Represents an unset property value.
        /// </summary>
-        public static readonly object UnsetValue = new Unset();
+        public static readonly object UnsetValue = new UnsetValueType();
        private static int s_nextId;
        private readonly Subject<AvaloniaPropertyChangedEventArgs> _initialized;
@ -546,16 +546,17 @@ namespace Avalonia
            }
        }
    }
    /// <summary>
    /// Class representing the <see cref="AvaloniaProperty.UnsetValue"/>.
    /// </summary>
    public class UnsetValueType
    {
        /// <summary>
-        /// Class representing the <see cref="UnsetValue"/>.
+        /// Returns the string representation of the <see cref="AvaloniaProperty.UnsetValue"/>.
        /// </summary>
-        private class Unset
+        /// <returns>The string "(unset)".</returns>
-        {
+        public override string ToString() => "(unset)";
            /// <summary>
            /// Returns the string representation of the <see cref="UnsetValue"/>.
            /// </summary>
            /// <returns>The string "(unset)".</returns>
            public override string ToString() => "(unset)";
        }
    }
 }
--- a/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
@ -9,7 +9,10 @@ namespace Avalonia.Data.Core
    /// Exception thrown when <see cref="ExpressionObserver"/> could not parse the provided
    /// expression string.
    /// </summary>
-    public class ExpressionParseException : Exception
+#if !BUILDTASK
    public
 #endif
    class ExpressionParseException : Exception
    {
        /// <summary>
        /// Initializes a new instance of the <see cref="ExpressionParseException"/> class.
	`@ -1 +1 @@`
		`Subproject commit aef10ae67dc55c95f49b52a505a0be33bfa297a5`			`Subproject commit 4464343aef5c8ab7a42fcb20a483a6058199f8b8`